Commit 34914878 authored Jun 18, 2019 by Marcos Paulo de Souza Committed by Greg Kroah-Hartman Jul 03, 2019

usb: storage: scsiglue: Do not skip VPD if try_vpd_pages is set

If BLIST_TRY_VPD_PAGES is set for a device, even for an USB, it should
be honored, so only set skip_vpd_pages is try_vpd_pages is not set.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 51785bdd

drivers/usb/storage/scsiglue.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -195,8 +195,11 @@ static int slave_configure(struct scsi_device *sdev)
		*/
		sdev->skip_ms_page_8 = 1;

		/* Some devices don't handle VPD pages correctly */
		sdev->skip_vpd_pages = 1;
		/*
		* Some devices don't handle VPD pages correctly, so skip vpd
		* pages if not forced by SCSI layer.
		*/
		sdev->skip_vpd_pages = !sdev->try_vpd_pages;

		/* Do not attempt to use REPORT SUPPORTED OPERATION CODES */
		sdev->no_report_opcodes = 1;