Message ID | 20190618224454.16595-1-marcos.souza.org@gmail.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 349148785b8cea9781af520fd53c29ee8087ee74 |
Headers | show |
Series | [v2] usb: storage: scsiglue: Do not skip VPD if try_vpd_pages is set | expand |
humble ping :) On Tue, Jun 18, 2019 at 07:44:54PM -0300, Marcos Paulo de Souza wrote: > 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> > --- > > Changes from v1: > changed the check of try_vpd_pages from: > sdev->try_vpd_pages == 0; > to: > !sdev->try_vpd_pages; > (as suggested by Alan Stern) > > 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..30790240aec6 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; > > /* Do not attempt to use REPORT SUPPORTED OPERATION CODES */ > sdev->no_report_opcodes = 1; > -- > 2.21.0 >
ping? On Tue, Jun 18, 2019 at 07:44:54PM -0300, Marcos Paulo de Souza wrote: > 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> > --- > > Changes from v1: > changed the check of try_vpd_pages from: > sdev->try_vpd_pages == 0; > to: > !sdev->try_vpd_pages; > (as suggested by Alan Stern) > > 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..30790240aec6 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; > > /* Do not attempt to use REPORT SUPPORTED OPERATION CODES */ > sdev->no_report_opcodes = 1; > -- > 2.21.0 >
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 59190d88fa9f..30790240aec6 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; /* Do not attempt to use REPORT SUPPORTED OPERATION CODES */ sdev->no_report_opcodes = 1;