Merge tag 'rproc-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux-block.git] / drivers / scsi / sd_zbc.c

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index 65bfd1e170da980ecc8b35839b3111f10693c82b..378d071e47cbc02ad84dc906c84da7e69da8fa02 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -61,10 +61,10 @@ static int sd_zbc_parse_report(struct scsi_disk *sdkp, u8 *buf,
        zone.len = logical_to_sectors(sdp, get_unaligned_be64(&buf[8]));
        zone.capacity = zone.len;
        zone.start = logical_to_sectors(sdp, get_unaligned_be64(&buf[16]));
-       zone.wp = logical_to_sectors(sdp, get_unaligned_be64(&buf[24]));
-       if (zone.type != ZBC_ZONE_TYPE_CONV &&
-           zone.cond == ZBC_ZONE_COND_FULL)
+       if (zone.cond == ZBC_ZONE_COND_FULL)
                zone.wp = zone.start + zone.len;
+       else
+               zone.wp = logical_to_sectors(sdp, get_unaligned_be64(&buf[24]));
 
        ret = cb(&zone, idx, data);
        if (ret)