Revert "pl2303: simplify the else-if contruct for type_1 chips in pl2…

…303_startup()" This reverts commit 73b583a. Revert all of the pl2303 changes that went into 3.12-rc1 and -rc2 as they cause regressions on some versions of the chip. This will all be revisited for later kernel versions when we can figure out how to handle this in a way that does not break working devices. Reported-by: Mika Westerberg <[email protected]> Cc: Frank Schäfer <[email protected]> Acked-by: Johan Hovold <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
levisjani · Nov 1, 2013 · 281393a · 281393a
1 parent b52e111
commit 281393a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
@@ -193,8 +193,9 @@ static int pl2303_startup(struct usb_serial *serial)
 		type = type_0;
 	else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40)
 		type = HX;
-	else if (serial->dev->descriptor.bDeviceClass == 0x00
-		 || serial->dev->descriptor.bDeviceClass == 0xFF)
+	else if (serial->dev->descriptor.bDeviceClass == 0x00)
+		type = type_1;
+	else if (serial->dev->descriptor.bDeviceClass == 0xFF)
 		type = type_1;
 	dev_dbg(&serial->interface->dev, "device type: %d\n", type);