From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcos Paulo de Souza Subject: [PATCH 2/2] usb: storage: scsiglue: Do not skip VPD if try_vpd_pages is set Date: Mon, 17 Jun 2019 22:31:46 -0300 Message-ID: <20190618013146.21961-3-marcos.souza.org@gmail.com> References: <20190618013146.21961-1-marcos.souza.org@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190618013146.21961-1-marcos.souza.org@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Marcos Paulo de Souza , Alan Stern , Greg Kroah-Hartman , "open list:USB MASS STORAGE DRIVER" , "open list:USB MASS STORAGE DRIVER" List-Id: linux-scsi@vger.kernel.org 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 --- drivers/usb/storage/scsiglue.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 59190d88fa9f..0a9520780771 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -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 == 0; /* Do not attempt to use REPORT SUPPORTED OPERATION CODES */ sdev->no_report_opcodes = 1; -- 2.21.0