summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2019-11-14 12:27:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-18 12:41:55 +0100
commit335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f (patch)
tree43cad3ba72f10b35da828c9642b24ff34812852c /drivers/usb
parentUSB: uas: honor flag to avoid CAPACITY16 (diff)
downloadlinux-335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f.tar.xz
linux-335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f.zip
USB: uas: heed CAPACITY_HEURISTICS
There is no need to ignore this flag. We should be as close to storage in that regard as makes sense, so honor flags whose cost is tiny. Signed-off-by: Oliver Neukum <oneukum@suse.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20191114112758.32747-3-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/storage/uas.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index def2d4aba549..475b9c692827 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -838,6 +838,12 @@ static int uas_slave_configure(struct scsi_device *sdev)
sdev->fix_capacity = 1;
/*
+ * in some cases we have to guess
+ */
+ if (devinfo->flags & US_FL_CAPACITY_HEURISTICS)
+ sdev->guess_capacity = 1;
+
+ /*
* Some devices don't like MODE SENSE with page=0x3f,
* which is the command used for checking if a device
* is write-protected. Now that we tell the sd driver