Commit: b2dc65e856c69b36a183c0ba41ff5f5a3af92fc8 - linux_3.x_apsh4a0a (git)

linux-3.0.x for AP-SH4A-0A Board

Commit MetaInfo

• Révision: b2dc65e856c69b36a183c0ba41ff5f5a3af92fc8 (tree)
• l'heure: 2011-08-18 02:55:51
• Auteur: Ionut Nicu <ionut.nicu@clou...>
• Commiter: Greg Kroah-Hartman

Message de Log

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 <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

Change Summary

• modified: drivers/usb/serial/ftdi_sio.c

Modification

--- 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);