From 01437d08d9008c18faae95f924c9bb87e5d43ccd Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Tue, 5 Jun 2007 13:01:33 +0800 Subject: [PATCH] --- yaml --- r: 57549 b: refs/heads/master c: ef143d577ba98c8a53aee9aa60e7d1f07c32fd7a h: refs/heads/master i: 57547: 562d39650243f862980ac0e3f07e716fd91e731e v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f0d616112a2a..3b6dae4353b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22888423b3b1b96573250671afb5b72ea4364902 +refs/heads/master: ef143d577ba98c8a53aee9aa60e7d1f07c32fd7a diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index c90c8e0fc49c..e7937166a8ba 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/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); }