From: Baruch Even Date: Fri, 5 Apr 2013 16:11:45 +0000 (+0300) Subject: [libata] SCSI: really use SATL version in VPD X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3f1317a2be018d03435d48645df6d17eaa2a8421;p=deliverable%2Flinux.git [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 Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index fe759cafc67a..dd310b27b24c 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 */