diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-24 22:57:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-24 22:57:49 +0100 |
| commit | 1c41a9570a02cec80be5fb4f7f9cf206220d84a5 (patch) | |
| tree | 21eeee43b0cb88415ea809bfab3f2b432fd5ac45 /drivers/usb/gadget/function/f_mass_storage.c | |
| parent | cd0e075784f4bce97b4ed47d4b354f045e895546 (diff) | |
| parent | 3e457371f436e89ce9239674828f9729a36b2595 (diff) | |
| download | op-kernel-dev-1c41a9570a02cec80be5fb4f7f9cf206220d84a5.zip op-kernel-dev-1c41a9570a02cec80be5fb4f7f9cf206220d84a5.tar.gz | |
Merge tag 'usb-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v4.1 merge window
As usual, a big pile of commits. This time a total
of 111 non-merge commits.
Other than the usual set of cleanups and non-critical
fixes, we have some interesting work for AM335x's MUSB
babble recovery. Now that takes a lot less time and we
don't have to Reset MUSB all the time.
The printer gadget has been converted to configfs interface
and the atmel udc has learned suspend/resume with wakeup.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_mass_storage.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_mass_storage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 49a2f19..3cc109f 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -1085,7 +1085,7 @@ static int do_inquiry(struct fsg_common *common, struct fsg_buffhd *bh) if (!curlun) { /* Unsupported LUNs are okay */ common->bad_lun_okay = 1; memset(buf, 0, 36); - buf[0] = 0x7f; /* Unsupported, no device-type */ + buf[0] = TYPE_NO_LUN; /* Unsupported, no device-type */ buf[4] = 31; /* Additional length */ return 36; } |
