From: Oliver Neukum Date: Thu, 14 Nov 2019 11:27:57 +0000 (+0100) Subject: USB: uas: heed CAPACITY_HEURISTICS X-Git-Tag: v5.5-rc1~137^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f;p=thirdparty%2Fkernel%2Flinux.git 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 Cc: stable Link: https://lore.kernel.org/r/20191114112758.32747-3-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index def2d4aba5493..475b9c692827a 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -837,6 +837,12 @@ static int uas_slave_configure(struct scsi_device *sdev) if (devinfo->flags & US_FL_FIX_CAPACITY) 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