Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c78968bb authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] SCSI: simulator version, not device version, belongs in VPD 



Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 24f75686

drivers/ata/libata-core.c

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ 


#include "libata.h"



#define DRV_VERSION	"2.21"	/* must be exactly four chars */





/* debounce timing parameters in msecs { interval, duration, timeout } */

const unsigned long sata_deb_timing_normal[]		= {   5,  100, 2000 };

drivers/ata/libata-scsi.c

+3 −2
Original line number Diff line number Diff line
@@ -1831,8 +1831,9 @@ unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf, 
	pbuf[2] = (0x238 >> 8);		/* page size fixed at 238h */

	pbuf[3] = (0x238 & 0xff);



	memcpy(&pbuf[8], "ATA     ", 8);

	ata_id_string(args->id, &pbuf[16], ATA_ID_PROD, 16);

	memcpy(&pbuf[8], "linux   ", 8);

	memcpy(&pbuf[16], "libata          ", 16);

	memcpy(&pbuf[32], DRV_VERSION, 4);

	ata_id_string(args->id, &pbuf[32], ATA_ID_FW_REV, 4);



	/* we don't store the ATA device signature, so we fake it */

drivers/ata/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define __LIBATA_H__



#define DRV_NAME	"libata"

#define DRV_VERSION	"2.21"	/* must be exactly four chars */



struct ata_scsi_args {

	struct ata_device	*dev;