openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "pl2303: improve the chip type information output on startup" 

This reverts commit a77a8c23e4.

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 <mika.westerberg@linux.intel.com>
Cc: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-11-01 09:17:50 -07:00
parent e8bbd5c42b
commit b52e111363
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usb/serial/pl2303.c
View File

@ -177,7 +177,6 @@ static int pl2303_startup(struct usb_serial *serial)
{ {
struct pl2303_serial_private *spriv; struct pl2303_serial_private *spriv;
enum pl2303_type type = type_0; enum pl2303_type type = type_0;
char *type_str = "unknown (treating as type_0)";
unsigned char *buf; unsigned char *buf;
spriv = kzalloc(sizeof(*spriv), GFP_KERNEL); spriv = kzalloc(sizeof(*spriv), GFP_KERNEL);
@ -190,18 +189,14 @@ static int pl2303_startup(struct usb_serial *serial)
return -ENOMEM; return -ENOMEM;
} }
if (serial->dev->descriptor.bDeviceClass == 0x02) { if (serial->dev->descriptor.bDeviceClass == 0x02)
type = type_0; type = type_0;
type_str = "type_0"; else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40)
} else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40) {
type = HX; type = HX;
type_str = "X/HX"; else if (serial->dev->descriptor.bDeviceClass == 0x00
} else if (serial->dev->descriptor.bDeviceClass == 0x00 || serial->dev->descriptor.bDeviceClass == 0xFF)
|| serial->dev->descriptor.bDeviceClass == 0xFF) {
type = type_1; type = type_1;
type_str = "type_1"; dev_dbg(&serial->interface->dev, "device type: %d\n", type);
}
dev_dbg(&serial->interface->dev, "device type: %s\n", type_str);
spriv->type = type; spriv->type = type;
usb_set_serial_data(serial, spriv); usb_set_serial_data(serial, spriv);