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

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

Revert "pl2303: simplify the else-if contruct for type_1 chips in pl2303_startup()" 



This reverts commit 73b583af.

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 b52e1113

drivers/usb/serial/pl2303.c

+3 −2
Original line number Diff line number Diff line
@@ -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);