diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2015-04-14 17:11:03 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-04-16 10:37:12 -0700 |
commit | e557990e358934fb168d30371c9c0f63e314c6b8 (patch) | |
tree | e062f9d7688116868add0f400e6985aca4855c28 /drivers/scsi | |
parent | e727c42bd55794765c460b7ac2b6cc969f2a9698 (diff) | |
download | linux-e557990e358934fb168d30371c9c0f63e314c6b8.tar.gz linux-e557990e358934fb168d30371c9c0f63e314c6b8.tar.bz2 linux-e557990e358934fb168d30371c9c0f63e314c6b8.zip |
sd: Fix missing ATO tag check
3aec2f41a8bae 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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/sd_dif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c index 14c7d42a11c2..5c06d292b94c 100644 --- a/drivers/scsi/sd_dif.c +++ b/drivers/scsi/sd_dif.c @@ -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) |