diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-30 19:08:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-30 19:08:53 +0300 |
| commit | dcca8de0aa597f14e31a1b38690626c9f6745fd5 (patch) | |
| tree | 7c8c794f75d42aa999da232229fd2feb9625153c /include | |
| parent | 73be174cf5c37a90855b9ae9b8e58848716d898f (diff) | |
| parent | 0d3bba0287d4e284c3ec7d3397e81eec920d5e7e (diff) | |
| download | linux-dcca8de0aa597f14e31a1b38690626c9f6745fd5.tar.xz | |
Merge tag 'usb-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are a number of small USB fixes for 4.2-rc2. They revert one
problem patch, fix some minor things, and add some new quirks for
"broken" devices.
All have been in linux-next successfully"
* tag 'usb-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
cdc-acm: prevent infinite loop when parsing CDC headers.
Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"
usb: chipidea: otg: remove mutex unlock and lock while stop and start role
uas: Set max_sectors_240 quirk for ASM1053 devices
uas: Add US_FL_MAX_SECTORS_240 flag
uas: Allow uas_use_uas_driver to return usb-storage flags
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb_usual.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index a7f2604c5f25..7f5f78bd15ad 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h @@ -77,6 +77,8 @@ /* Cannot handle ATA_12 or ATA_16 CDBs */ \ US_FLAG(NO_REPORT_OPCODES, 0x04000000) \ /* Cannot handle MI_REPORT_SUPPORTED_OPERATION_CODES */ \ + US_FLAG(MAX_SECTORS_240, 0x08000000) \ + /* Sets max_sectors to 240 */ \ #define US_FLAG(name, value) US_FL_##name = value , enum { US_DO_ALL_FLAGS }; |