---

yaml --- r: 262917 b: refs/heads/master c: 1862cdd h: refs/heads/master i: 262915: 088714b v: v3
git-mirror · Aug 8, 2011 · df4669d · df4669d
1 parent 4c3d0b8
commit df4669d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);