X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fscsi%2Fsd.c;h=5ba5c2a9e8e987ffe95da22a179d42b18590570e;hb=a75ee6ecd411a50bf4da927c2fdb2cb56246a2bd;hp=92ab87a188b71d8f543b10cfe1fb9330491404c0;hpb=699316948628dab9e813c415640fe5b9f65cd5e3;p=~andy%2Flinux

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 92ab87a188b..5ba5c2a9e8e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2435,7 +2435,7 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
 	 * some USB ones crash on receiving them, and the pages
 	 * we currently ask for are for SPC-3 and beyond
 	 */
-	if (sdp->scsi_level > SCSI_SPC_2)
+	if (sdp->scsi_level > SCSI_SPC_2 && !sdp->skip_vpd_pages)
 		return 1;
 	return 0;
 }