diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
| commit | 312effedac183148411c965e20a62e73f23979f6 (patch) | |
| tree | 81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /drivers/usb/serial/ftdi_sio.c | |
| parent | d3828df964e542533765b23f9a343657c7860e17 (diff) | |
| parent | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff) | |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 2e06b90aa1f..9afb3614373 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1171,7 +1171,7 @@ static __u32 get_ftdi_divisor(struct tty_struct *tty, case FT2232H: /* FT2232H chip */ case FT4232H: /* FT4232H chip */ case FT232H: /* FT232H chip */ - if ((baud <= 12000000) & (baud >= 1200)) { + if ((baud <= 12000000) && (baud >= 1200)) { div_value = ftdi_2232h_baud_to_divisor(baud); } else if (baud < 1200) { div_value = ftdi_232bm_baud_to_divisor(baud); |