aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/storage/unusual_uas.h
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-08-25 22:44:12 +0800
committerAlex Shi <alex.shi@linaro.org>2017-08-25 22:44:12 +0800
commit0de48f949a2d3ed1e4b745e9dd612f072aaee77e (patch)
treeff17f1af062e4d97e9fa2c67bb00c864dc209ab6 /drivers/usb/storage/unusual_uas.h
parentdb5bc601e46abbb8fc4c17a6bc848c560e80fe57 (diff)
parent2d24df0e84490d49a5211468e8793ecf9ad8a5bb (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.08-android
Diffstat (limited to 'drivers/usb/storage/unusual_uas.h')
-rw-r--r--drivers/usb/storage/unusual_uas.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
index 53341a77d89f..a37ed1e59e99 100644
--- a/drivers/usb/storage/unusual_uas.h
+++ b/drivers/usb/storage/unusual_uas.h
@@ -123,9 +123,9 @@ UNUSUAL_DEV(0x0bc2, 0xab2a, 0x0000, 0x9999,
/* Reported-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> */
UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999,
"Initio Corporation",
- "",
+ "INIC-3069",
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
- US_FL_NO_ATA_1X),
+ US_FL_NO_ATA_1X | US_FL_IGNORE_RESIDUE),
/* Reported-by: Tom Arild Naess <tanaess@gmail.com> */
UNUSUAL_DEV(0x152d, 0x0539, 0x0000, 0x9999,