summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-27 21:02:45 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-27 21:02:45 +0100
commit5b94e1816703c1f06646501c2474835416c35580 (patch)
tree56bada0b7eec657c8ea966573eb28d75eba9e6ed /drivers/usb
parentMerge tag 'v3.7-rc6' into asoc-wm2200 (diff)
parentLinux 3.7-rc7 (diff)
downloadlinux-5b94e1816703c1f06646501c2474835416c35580.tar.xz
linux-5b94e1816703c1f06646501c2474835416c35580.zip
Merge tag 'v3.7-rc7' into asoc-wm2200
Linux 3.7-rc7
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/storage/scsiglue.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index a3d54366afcc..92f35abee92d 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -186,6 +186,12 @@ static int slave_configure(struct scsi_device *sdev)
/* Some devices don't handle VPD pages correctly */
sdev->skip_vpd_pages = 1;
+ /* Do not attempt to use REPORT SUPPORTED OPERATION CODES */
+ sdev->no_report_opcodes = 1;
+
+ /* Do not attempt to use WRITE SAME */
+ sdev->no_write_same = 1;
+
/* Some disks return the total number of blocks in response
* to READ CAPACITY rather than the highest block number.
* If this device makes that mistake, tell the sd driver. */