Skip to content

Commit

Permalink
sd: Fix missing ATO tag check
Browse files Browse the repository at this point in the history
3aec2f4 introduced a merge error where we would end up check for
sdkp instead of sdkp->ATO. Fix this so we register app tag capability
correctly.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: <stable@vger.kernel.org> # v3.17+
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
  • Loading branch information
Martin K. Petersen authored and James Bottomley committed Apr 16, 2015
1 parent e727c42 commit e557990
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/scsi/sd_dif.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void sd_dif_config_host(struct scsi_disk *sdkp)

disk->integrity->flags |= BLK_INTEGRITY_DEVICE_CAPABLE;

if (!sdkp)
if (!sdkp->ATO)
return;

if (type == SD_DIF_TYPE3_PROTECTION)
Expand Down

0 comments on commit e557990

Please sign in to comment.