git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/cpufeature' into irq/numa
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
serial
/
usb-serial.c
diff --git
a/drivers/usb/serial/usb-serial.c
b/drivers/usb/serial/usb-serial.c
index 0a566eea49c02e193fcdca270488ab029742c264..f331e2bde88acbb0c2b4e36fee01eff68ffc9b5c 100644
(file)
--- a/
drivers/usb/serial/usb-serial.c
+++ b/
drivers/usb/serial/usb-serial.c
@@
-974,6
+974,7
@@
int usb_serial_probe(struct usb_interface *interface,
if (retval > 0) {
/* quietly accept this device, but don't bind to a
serial port as it's about to disappear */
+ serial->num_ports = 0;
goto exit;
}
}