Commit 1700714b authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

scsi: sd: sd_read_cpr() requires VPD pages 

As such it should be called inside the scsi_device_supports_vpd()
conditional.

Link: https://lore.kernel.org/r/20220302053559.32147-13-martin.petersen@oracle.com


Fixes: e815d365 ("scsi: sd: add concurrent positioning ranges support")
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f61eb121

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -3216,6 +3216,7 @@ static int sd_revalidate_disk(struct gendisk *disk) 
			sd_read_block_limits(sdkp);

			sd_read_block_characteristics(sdkp);

			sd_zbc_read_zones(sdkp, buffer);

			sd_read_cpr(sdkp);

		}



		sd_print_capacity(sdkp, old_capacity);
@@ -3225,7 +3226,6 @@ static int sd_revalidate_disk(struct gendisk *disk) 
		sd_read_app_tag_own(sdkp, buffer);

		sd_read_write_same(sdkp, buffer);

		sd_read_security(sdkp, buffer);

		sd_read_cpr(sdkp);

	}



	/*