From df4669dbe8bd3802a42b6e0a5e5bd8fa742c57a9 Mon Sep 17 00:00:00 2001 From: Ionut Nicu Date: Mon, 11 Jul 2011 16:46:12 +0300 Subject: [PATCH] --- yaml --- r: 262917 b: refs/heads/master c: 1862cdd542025218f7a390b7e6ddc83a1362d1e0 h: refs/heads/master i: 262915: 088714bade4c8b2303f48561cc0a7db5c126300d v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc86f67008fc..4cdb389f0a8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eed393667b15a8f42fc0cdf5e8fee49f77c79aae +refs/heads/master: 1862cdd542025218f7a390b7e6ddc83a1362d1e0 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index 2e06b90aa1f8..9afb36143738 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/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);