diff options
| author | Frank Schäfer | 2013-08-14 20:09:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-08-14 21:12:42 +0200 |
| commit | 73b583af597542329e6adae44524da6f27afed62 (patch) | |
| tree | 420cd4bebb16f934a3653febaa7e3e9ca1e516bf | |
| parent | Merge tag 'usb-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ba... (diff) | |
| download | kernel-qcow2-linux-73b583af597542329e6adae44524da6f27afed62.tar.gz kernel-qcow2-linux-73b583af597542329e6adae44524da6f27afed62.tar.xz kernel-qcow2-linux-73b583af597542329e6adae44524da6f27afed62.zip | |
pl2303: simplify the else-if contruct for type_1 chips in pl2303_startup()
There is no need for two else-if constructs for the type_1 chip
detection in pl2303_startup(), so merge them.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/pl2303.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 6638c5d9079d..7efb39cd6f74 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -193,9 +193,8 @@ 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) - type = type_1; - else if (serial->dev->descriptor.bDeviceClass == 0xFF) + else if (serial->dev->descriptor.bDeviceClass == 0x00 + || serial->dev->descriptor.bDeviceClass == 0xFF) type = type_1; dev_dbg(&serial->interface->dev, "device type: %d\n", type); |