Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
serial
/
visor.c
diff --git
a/kernel/drivers/usb/serial/visor.c
b/kernel/drivers/usb/serial/visor.c
index
60afb39
..
337a0be
100644
(file)
--- a/
kernel/drivers/usb/serial/visor.c
+++ b/
kernel/drivers/usb/serial/visor.c
@@
-544,6
+544,11
@@
static int treo_attach(struct usb_serial *serial)
(serial->num_interrupt_in == 0))
return 0;
(serial->num_interrupt_in == 0))
return 0;
+ if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) {
+ dev_err(&serial->interface->dev, "missing endpoints\n");
+ return -ENODEV;
+ }
+
/*
* It appears that Treos and Kyoceras want to use the
* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
/*
* It appears that Treos and Kyoceras want to use the
* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
@@
-597,8
+602,10
@@
static int clie_5_attach(struct usb_serial *serial)
*/
/* some sanity check */
*/
/* some sanity check */
- if (serial->num_ports < 2)
- return -1;
+ if (serial->num_bulk_out < 2) {
+ dev_err(&serial->interface->dev, "missing bulk out endpoints\n");
+ return -ENODEV;
+ }
/* port 0 now uses the modified endpoint Address */
port = serial->port[0];
/* port 0 now uses the modified endpoint Address */
port = serial->port[0];