diff options
| author | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:35:49 -0700 |
|---|---|---|
| committer | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:36:44 -0700 |
| commit | 02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5 (patch) | |
| tree | 20e69aae8d0acfcd7edc954e70a9d751e0b54a7e /drivers/usb/image/microtek.c | |
| parent | 8a5a499871308c093ced3c5a383b72502b96e0d2 (diff) | |
| parent | b42aa3fd5957e4daf4b69129e5ce752a2a53e7d6 (diff) | |
Merge tag 'mips_fixes_5.4_3' into mips-next
Pull in mips-fixes primarily to gain build fixes in order to allow
better testing of mips-next.
A few MIPS fixes:
- Fix VDSO time-related function behavior for systems where we need to
fall back to syscalls, but were instead returning bogus results.
- A fix to TLB exception handlers for Cavium Octeon systems where they
would inadvertently clobber the $1/$at register.
- A build fix for bcm63xx configurations.
- Switch to using my @kernel.org email address.
Signed-off-by: Paul Burton <paulburton@kernel.org>
Diffstat (limited to 'drivers/usb/image/microtek.c')
| -rw-r--r-- | drivers/usb/image/microtek.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 0a57c2cc8e5a..7a6b122c833f 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c @@ -716,6 +716,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" ); |