瀏覽代碼

USB: pl2303: add quirk for legacy devices

Add quirk for legacy devices (type 0 and 1) rather than testing on
device type throughout the driver.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold 11 年之前
父節點
當前提交
23c6acb968
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      drivers/usb/serial/pl2303.c

+ 6 - 3
drivers/usb/serial/pl2303.c

@@ -33,6 +33,7 @@
 
 
 #define PL2303_QUIRK_UART_STATE_IDX0		BIT(0)
+#define PL2303_QUIRK_LEGACY			BIT(1)
 
 static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) },
@@ -224,6 +225,8 @@ static int pl2303_startup(struct usb_serial *serial)
 
 	spriv->type = type;
 	spriv->quirks = (unsigned long)usb_get_serial_data(serial);
+	if (type == TYPE_01)
+		spriv->quirks |= PL2303_QUIRK_LEGACY;
 
 	usb_set_serial_data(serial, spriv);
 
@@ -237,7 +240,7 @@ static int pl2303_startup(struct usb_serial *serial)
 	pl2303_vendor_read(serial, 0x8383, buf);
 	pl2303_vendor_write(serial, 0, 1);
 	pl2303_vendor_write(serial, 1, 0);
-	if (type == TYPE_01)
+	if (spriv->quirks & PL2303_QUIRK_LEGACY)
 		pl2303_vendor_write(serial, 2, 0x24);
 	else
 		pl2303_vendor_write(serial, 2, 0x44);
@@ -531,7 +534,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
 	}
 
 	if (C_CRTSCTS(tty)) {
-		if (spriv->type == TYPE_01)
+		if (spriv->quirks & PL2303_QUIRK_LEGACY)
 			pl2303_vendor_write(serial, 0x0, 0x41);
 		else
 			pl2303_vendor_write(serial, 0x0, 0x61);
@@ -571,7 +574,7 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
 	struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
 	int result;
 
-	if (spriv->type == TYPE_01) {
+	if (spriv->quirks & PL2303_QUIRK_LEGACY) {
 		usb_clear_halt(serial->dev, port->write_urb->pipe);
 		usb_clear_halt(serial->dev, port->read_urb->pipe);
 	} else {