1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c90c8e0fc49c..e7937166a8ba 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1900,6 +1900,13 @@ int ata_dev_configure(struct ata_device *dev)
         if (ata_msg_probe(ap))
                 ata_dump_id(id);
 
+        /* SCSI only uses 4-char revisions, dump full 8 chars from ATA */
+        ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,
+                        sizeof(fwrevbuf));
+
+        ata_id_c_string(dev->id, modelbuf, ATA_ID_PROD,
+                        sizeof(modelbuf));
+
         /* ATA-specific feature tests */
         if (dev->class == ATA_DEV_ATA) {
                 if (ata_id_is_cfa(id)) {
@@ -1914,13 +1921,6 @@ int ata_dev_configure(struct ata_device *dev)
 
                 dev->n_sectors = ata_id_n_sectors(id);
 
-                /* SCSI only uses 4-char revisions, dump full 8 chars from ATA */
-                ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,
-                                sizeof(fwrevbuf));
-
-                ata_id_c_string(dev->id, modelbuf, ATA_ID_PROD,
-                                sizeof(modelbuf));
-
                 if (dev->id[59] & 0x100)
                         dev->multi_count = dev->id[59] & 0xff;
 
@@ -2009,7 +2009,9 @@ int ata_dev_configure(struct ata_device *dev)
 
                 /* print device info to dmesg */
                 if (ata_msg_drv(ap) && print_info)
-                        ata_dev_printk(dev, KERN_INFO, "ATAPI, max %s%s\n",
+                        ata_dev_printk(dev, KERN_INFO,
+                                       "ATAPI: %s, %s, max %s%s\n",
+                                       modelbuf, fwrevbuf,
                                        ata_mode_string(xfer_mask),
                                        cdb_intr_string);
         }