From bff000cae1eec750d62e265c4ba2db9af57b17e1 Mon Sep 17 00:00:00 2001

From: Oliver Neukum <oneukum@suse.com>

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

Subject: [PATCH] USB: uas: honor flag to avoid CAPACITY16

Git-commit: bff000cae1eec750d62e265c4ba2db9af57b17e1

Patch-mainline: v5.5-rc1

References: bsc#1051510

Copy the support over from usb-storage to get feature parity

Signed-off-by: Oliver Neukum <oneukum@suse.com>

Cc: stable <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/20191114112758.32747-2-oneukum@suse.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

---

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

 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c

index 34538253f12c..def2d4aba549 100644

--- a/drivers/usb/storage/uas.c

+++ b/drivers/usb/storage/uas.c

@@ -825,6 +825,10 @@ static int uas_slave_configure(struct scsi_device *sdev)

 		sdev->wce_default_on = 1;

 	}

+	/* Some disks cannot handle READ_CAPACITY_16 */

+	if (devinfo->flags & US_FL_NO_READ_CAPACITY_16)

+		sdev->no_read_capacity_16 = 1;

+

 	/*

 	 * Some disks return the total number of blocks in response

 	 * to READ CAPACITY rather than the highest block number.

-- 

2.16.4