From 1d24b0c9fc317c8b16715cacb07b12502214e93c Mon Sep 17 00:00:00 2001 From: Thiago Galesi Date: Sat, 29 Jul 2006 10:47:12 -0300 Subject: [PATCH] --- yaml --- r: 36387 b: refs/heads/master c: 9c53761681497d598a31ed2f6b29b5b3480c49db h: refs/heads/master i: 36385: 3632a02b796b8cbdacdf00ee6db849db3ac4a14d 36383: d457c67c941546cb459bf0d08ed9ec70cf77e21d v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/pl2303.c | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e32ec812b63b..7e52ccbdacf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 572d3138eb0cf17a2bf36944cc1d2c753578862e +refs/heads/master: 9c53761681497d598a31ed2f6b29b5b3480c49db diff --git a/trunk/drivers/usb/serial/pl2303.c b/trunk/drivers/usb/serial/pl2303.c index e2d8f9b94eed..51caf8a61463 100644 --- a/trunk/drivers/usb/serial/pl2303.c +++ b/trunk/drivers/usb/serial/pl2303.c @@ -920,13 +920,20 @@ static void pl2303_update_line_status(struct usb_serial_port *port, unsigned long flags; u8 status_idx = UART_STATE; u8 length = UART_STATE + 1; + u16 idv, idp; - if ((le16_to_cpu(port->serial->dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) && - (le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X65 || - le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_SX1 || - le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X75)) { - length = 1; - status_idx = 0; + idv = le16_to_cpu(port->serial->dev->descriptor.idVendor); + idp = le16_to_cpu(port->serial->dev->descriptor.idProduct); + + + if (idv == SIEMENS_VENDOR_ID) { + if (idp == SIEMENS_PRODUCT_ID_X65 || + idp == SIEMENS_PRODUCT_ID_SX1 || + idp == SIEMENS_PRODUCT_ID_X75) { + + length = 1; + status_idx = 0; + } } if (actual_length < length)