From 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f Mon Sep 17 00:00:00 2001

From: Oliver Neukum <oneukum@suse.com>

Date: Thu, 14 Nov 2019 12:27:57 +0100

Subject: [PATCH] USB: uas: heed CAPACITY_HEURISTICS

Git-commit: 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f

Patch-mainline: v5.5-rc1

References: bsc#1051510

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>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/usb/storage/uas.c | 6 ++++++

 1 file changed, 6 insertions(+)

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

@@ -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

-- 

2.16.4