diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-23 10:33:34 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-23 10:33:34 +0300 |
| commit | 59c8231089be96165735585694a801ae58ec6c95 (patch) | |
| tree | 41bd60a9aec5df20e07a81fbb526c8bc05e997fc /drivers/usb/storage/unusual_uas.h | |
| parent | de5126cc3c0b0f291d08fa591dcdf237bc595a56 (diff) | |
| parent | 0fb0b822d157325b66c503d23332f64899bfb828 (diff) | |
| download | linux-59c8231089be96165735585694a801ae58ec6c95.tar.xz | |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_pm.c
Diffstat (limited to 'drivers/usb/storage/unusual_uas.h')
| -rw-r--r-- | drivers/usb/storage/unusual_uas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h index c85ea530085f..ccc113e83d88 100644 --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h @@ -132,7 +132,7 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999, "JMicron", "JMS567", USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_NO_REPORT_OPCODES), + US_FL_BROKEN_FUA | US_FL_NO_REPORT_OPCODES), /* Reported-by: Hans de Goede <hdegoede@redhat.com> */ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, |