commit e557990e358934fb168d30371c9c0f63e314c6b8
author Martin K. Petersen <martin.petersen@oracle.com> Tue Apr 14 17:11:03 2015 -0400
committer James Bottomley <JBottomley@Odin.com> Thu Apr 16 10:37:12 2015 -0700
tree e062f9d7688116868add0f400e6985aca4855c28
parent e727c42bd55794765c460b7ac2b6cc969f2a9698

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>

drivers/scsi/sd_dif.c

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 14c7d42..5c06d29 100644
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -77,7 +77,7 @@
 
 		disk->integrity->flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
 
-		if (!sdkp)
+		if (!sdkp->ATO)
 			return;
 
 		if (type == SD_DIF_TYPE3_PROTECTION)