diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2015-04-14 17:11:03 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 22:01:59 +0200 |
| commit | d8ec87c0d49900faa8ae522420fc03ad700e9a52 (patch) | |
| tree | 2f79c047adc8df0085a81bacf355d668f5ad1fc8 | |
| parent | 08b1599d174c902aa90758fdd2bdc457f6b72306 (diff) | |
| download | linux-d8ec87c0d49900faa8ae522420fc03ad700e9a52.tar.gz | |
sd: Fix missing ATO tag check
commit e557990e358934fb168d30371c9c0f63e314c6b8 upstream.
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>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 14c7d42a11c2af..5c06d292b94c70 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) |