Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b52e1113 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit a77a8c23.

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: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8bbd5c4

drivers/usb/serial/pl2303.c

+5 −10
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static int pl2303_startup(struct usb_serial *serial) 
{

	struct pl2303_serial_private *spriv;

	enum pl2303_type type = type_0;

	char *type_str = "unknown (treating as type_0)";

	unsigned char *buf;



	spriv = kzalloc(sizeof(*spriv), GFP_KERNEL);
@@ -190,18 +189,14 @@ static int pl2303_startup(struct usb_serial *serial) 
		return -ENOMEM;

	}



	if (serial->dev->descriptor.bDeviceClass == 0x02) {

	if (serial->dev->descriptor.bDeviceClass == 0x02)

		type = type_0;

		type_str = "type_0";

	} else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40) {

	else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40)

		type = HX;

		type_str = "X/HX";

	} else if (serial->dev->descriptor.bDeviceClass == 0x00

		   || serial->dev->descriptor.bDeviceClass == 0xFF) {

	else if (serial->dev->descriptor.bDeviceClass == 0x00

		 || serial->dev->descriptor.bDeviceClass == 0xFF)

		type = type_1;

		type_str = "type_1";

	}

	dev_dbg(&serial->interface->dev, "device type: %s\n", type_str);

	dev_dbg(&serial->interface->dev, "device type: %d\n", type);



	spriv->type = type;

	usb_set_serial_data(serial, spriv);