summaryrefslogtreecommitdiffstats
path: root/drivers/usb/image
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-14 07:09:59 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-14 07:09:59 +0200
commitbf7c1d95af67254957d1820ac112397001e1a9a9 (patch)
tree3adbfbc15812cd4aad20c1ce708fe33b639e0392 /drivers/usb/image
parent1141a7522e3961e8d4b20db7495d4dfb1e07d7ae (diff)
parent4f5cafb5cb8471e54afdc9054d973535614f7675 (diff)
downloadlinux-bf7c1d95af67254957d1820ac112397001e1a9a9.tar.bz2
Merge 5.4-rc3 into usb-next
we want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/image')
-rw-r--r--drivers/usb/image/microtek.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index ebe1362ac47f..360416680e82 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -715,6 +715,10 @@ static int mts_usb_probe(struct usb_interface *intf,
}
+ if (ep_in_current != &ep_in_set[2]) {
+ MTS_WARNING("couldn't find two input bulk endpoints. Bailing out.\n");
+ return -ENODEV;
+ }
if ( ep_out == -1 ) {
MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" );