diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 18:33:19 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 18:33:19 -0400 |
| commit | 301fd5c13257862df66c81c48d963d474e63e0ef (patch) | |
| tree | 128af89336dd8b1ee62696c4588057b2eb0b445e /drivers/usb/class/cdc-acm.c | |
| parent | daa56a06b5a592ceb69130a1d15c067a078f2701 (diff) | |
| parent | 7952717adb69efc1d2443a1858f96d23c2fb93e0 (diff) | |
Merge branch 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
* 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9g: enable restarting
+ sync to 3.6-rc3
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 56d6bf668488..f763ed7ba91e 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1104,7 +1104,8 @@ skip_normal_probe: | |||
| 1104 | } | 1104 | } |
| 1105 | 1105 | ||
| 1106 | 1106 | ||
| 1107 | if (data_interface->cur_altsetting->desc.bNumEndpoints < 2) | 1107 | if (data_interface->cur_altsetting->desc.bNumEndpoints < 2 || |
| 1108 | control_interface->cur_altsetting->desc.bNumEndpoints == 0) | ||
| 1108 | return -EINVAL; | 1109 | return -EINVAL; |
| 1109 | 1110 | ||
| 1110 | epctrl = &control_interface->cur_altsetting->endpoint[0].desc; | 1111 | epctrl = &control_interface->cur_altsetting->endpoint[0].desc; |