diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:19:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:19:32 +0200 |
| commit | e47ff590cc57a3468c1f77e5f2494bbaefdd4371 (patch) | |
| tree | 7c71b3832c0d805b0ee6daa1aaaa50326b65654f /drivers/usb/misc/idmouse.c | |
| parent | USB: core: fix up kerneldoc comment (diff) | |
| parent | Linux 4.11-rc4 (diff) | |
| download | linux-e47ff590cc57a3468c1f77e5f2494bbaefdd4371.tar.xz linux-e47ff590cc57a3468c1f77e5f2494bbaefdd4371.zip | |
Merge 4.11-rc4 into usb-next
This resolves a merge issue in the gadget code, and we want the USB
fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/idmouse.c')
| -rw-r--r-- | drivers/usb/misc/idmouse.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index d185f49c353e..81fcbf024c65 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c @@ -347,6 +347,9 @@ static int idmouse_probe(struct usb_interface *interface, if (iface_desc->desc.bInterfaceClass != 0x0A) return -ENODEV; + if (iface_desc->desc.bNumEndpoints < 1) + return -ENODEV; + /* allocate memory for our device state and initialize it */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (dev == NULL) |