git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: serial: mct_u232: fix modem-status error handling
[pandora-kernel.git]
/
drivers
/
usb
/
serial
/
mct_u232.c
diff --git
a/drivers/usb/serial/mct_u232.c
b/drivers/usb/serial/mct_u232.c
index
a7e7ba6
..
801c697
100644
(file)
--- a/
drivers/usb/serial/mct_u232.c
+++ b/
drivers/usb/serial/mct_u232.c
@@
-385,9
+385,13
@@
static int mct_u232_get_modem_stat(struct usb_serial *serial,
MCT_U232_GET_REQUEST_TYPE,
0, 0, buf, MCT_U232_GET_MODEM_STAT_SIZE,
WDR_TIMEOUT);
MCT_U232_GET_REQUEST_TYPE,
0, 0, buf, MCT_U232_GET_MODEM_STAT_SIZE,
WDR_TIMEOUT);
- if (rc <
0
) {
+ if (rc <
MCT_U232_GET_MODEM_STAT_SIZE
) {
dev_err(&serial->dev->dev,
"Get MODEM STATus failed (error = %d)\n", rc);
dev_err(&serial->dev->dev,
"Get MODEM STATus failed (error = %d)\n", rc);
+
+ if (rc >= 0)
+ rc = -EIO;
+
*msr = 0;
} else {
*msr = buf[0];
*msr = 0;
} else {
*msr = buf[0];