crypto: hisilicon/qm - fix print frequence in hisi_qp_send

[linux-2.6-microblaze.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index acde0ca..95018e6 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2578,8 +2578,6 @@ sd_print_capacity(struct scsi_disk *sdkp,
                sd_printk(KERN_NOTICE, sdkp,
                          "%u-byte physical blocks\n",
                          sdkp->physical_block_size);
-
-       sd_zbc_print_zones(sdkp);
 }
 
 /* called with buffer of length 512 */
@@ -3220,6 +3218,14 @@ static int sd_revalidate_disk(struct gendisk *disk)
        sd_config_write_same(sdkp);
        kfree(buffer);
 
+       /*
+        * For a zoned drive, revalidating the zones can be done only once
+        * the gendisk capacity is set. So if this fails, set back the gendisk
+        * capacity to 0.
+        */
+       if (sd_zbc_revalidate_zones(sdkp))
+               set_capacity_revalidate_and_notify(disk, 0, false);
+
  out:
        return 0;
 }