summaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2019-11-14 12:27:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-17 20:34:30 +0100
commit0c7149e2191958332a0dcd91f84676f0c9a518fc (patch)
tree07df6efdf4e88b1854562b62b35379a0f0371141 /drivers/usb/storage
parent0b495fa36eec75f8c60c6522bd91dfc06d55b59e (diff)
downloadlinux-stable-0c7149e2191958332a0dcd91f84676f0c9a518fc.tar.gz
linux-stable-0c7149e2191958332a0dcd91f84676f0c9a518fc.tar.bz2
linux-stable-0c7149e2191958332a0dcd91f84676f0c9a518fc.zip
USB: uas: heed CAPACITY_HEURISTICS
commit 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f upstream. 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/storage')
-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 4dfe21c814db..1c6eb3a8741e 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -845,6 +845,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