Merge tag 'for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen19...

[linux-2.6-microblaze.git] / drivers / scsi / sd_dif.c

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 968993e..1df847b 100644 (file)
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -39,8 +39,10 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
                dif = 0; dix = 1;
        }
 
-       if (!dix)
+       if (!dix) {
+               blk_integrity_unregister(disk);
                return;
+       }
 
        memset(&bi, 0, sizeof(bi));
 
@@ -72,9 +74,9 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
                        bi.tag_size = sizeof(u16);
        }
 
-       sd_printk(KERN_NOTICE, sdkp,
-                 "Enabling DIX %s, application tag size %u bytes\n",
-                 bi.profile->name, bi.tag_size);
+       sd_first_printk(KERN_NOTICE, sdkp,
+                       "Enabling DIX %s, application tag size %u bytes\n",
+                       bi.profile->name, bi.tag_size);
 out:
        blk_integrity_register(disk, &bi);
 }