1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a7b53be63367..7c4d2e68df1c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -384,7 +384,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         sector_t block = rq->sector;
         sector_t threshold;
         unsigned int this_count = rq->nr_sectors;
-        int ret;
+        int ret, host_dif;
 
         if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                 ret = scsi_setup_blk_pc_cmnd(sdp, rq);
@@ -515,7 +515,8 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                                         rq->nr_sectors));
 
         /* Set RDPROTECT/WRPROTECT if disk is formatted with DIF */
-        if (scsi_host_dif_capable(sdp->host, sdkp->protection_type))
+        host_dif = scsi_host_dif_capable(sdp->host, sdkp->protection_type);
+        if (host_dif)
                 SCpnt->cmnd[1] = 1 << 5;
         else
                 SCpnt->cmnd[1] = 0;
@@ -573,8 +574,9 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         SCpnt->sdb.length = this_count * sdp->sector_size;
 
         /* If DIF or DIX is enabled, tell HBA how to handle request */
-        if (sdkp->protection_type || scsi_prot_sg_count(SCpnt))
-                sd_dif_op(SCpnt, sdkp->protection_type, scsi_prot_sg_count(SCpnt));
+        if (host_dif || scsi_prot_sg_count(SCpnt))
+                sd_dif_op(SCpnt, host_dif, scsi_prot_sg_count(SCpnt),
+                          sdkp->protection_type);
 
         /*
          * We shouldn't disconnect in the middle of a sector, so with a dumb
@@ -1252,14 +1254,12 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
         else
                 type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */
 
+        sdkp->protection_type = type;
+
         switch (type) {
         case SD_DIF_TYPE0_PROTECTION:
-                sdkp->protection_type = 0;
-                break;
-
         case SD_DIF_TYPE1_PROTECTION:
         case SD_DIF_TYPE3_PROTECTION:
-                sdkp->protection_type = type;
                 break;
 
         case SD_DIF_TYPE2_PROTECTION:
@@ -1277,7 +1277,6 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
         return;
 
 disable:
-        sdkp->protection_type = 0;
         sdkp->capacity = 0;
 }