summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorIonut Nicu <ionut.nicu@cloudbit.ro>2011-07-11 16:46:12 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-17 10:55:51 -0700
commitb2dc65e856c69b36a183c0ba41ff5f5a3af92fc8 (patch)
treed79fcb6dfa2179a37b55d32cd2f5351f5e600c7b /drivers/usb
parent73ca9294d982e43a1945ae00262d9ee6b09efe34 (diff)
USB: ftdi_sio: fix minor typo in get_ftdi_divisor
commit 1862cdd542025218f7a390b7e6ddc83a1362d1e0 upstream. Even if it's unlikely for this to cause an error, there is a typo in the code that uses the bitwise-AND operator instead of the logical one. Signed-off-by: Ionut Nicu <ionut.nicu@cloudbit.ro> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 2e06b90aa1f8..9afb36143738 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);