summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorBaruch Even <baruch@ev-en.org>2013-04-05 19:11:45 +0300
committerJeff Garzik <jgarzik@redhat.com>2013-04-11 19:39:44 -0400
commit3f1317a2be018d03435d48645df6d17eaa2a8421 (patch)
tree8bf2b530d0b0c7eb414d9d00558c689d0b34fb85 /drivers/ata
parentb9d15db2b815fd5368fb993471463829fd6d1eec (diff)
downloadlinux-3.10-3f1317a2be018d03435d48645df6d17eaa2a8421.tar.gz
linux-3.10-3f1317a2be018d03435d48645df6d17eaa2a8421.tar.bz2
linux-3.10-3f1317a2be018d03435d48645df6d17eaa2a8421.zip
[libata] SCSI: really use SATL version in VPD
As per c78968bb by Jeff Garzik ([libata] SCSI: simulator version, not device version, belongs in VPD) We need to provide the SATL driver version and not the disk firmware version but the code overwrites the driver version with the disk version. Signed-off-by: Baruch Even <baruch@ev-en.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-scsi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index fe759cafc67..dd310b27b24 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2127,7 +2127,6 @@ static unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf)
memcpy(&rbuf[8], "linux ", 8);
memcpy(&rbuf[16], "libata ", 16);
memcpy(&rbuf[32], DRV_VERSION, 4);
- ata_id_string(args->id, &rbuf[32], ATA_ID_FW_REV, 4);
/* we don't store the ATA device signature, so we fake it */