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

Commit 3f884a0a authored by Xose Vazquez Perez's avatar Xose Vazquez Perez Committed by Martin K. Petersen
Browse files

scsi: devinfo: fix format of the device list 



Replace "" with NULL for product revision level, and merge TEXEL
duplicate entries.

Cc: Hannes Reinecke <hare@suse.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Cc: SCSI ML <linux-scsi@vger.kernel.org>
Signed-off-by: default avatarXose Vazquez Perez <xose.vazquez@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c93a9a16

drivers/scsi/scsi_devinfo.c

+3 −4
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ static struct { 
	 * seagate controller, which causes SCSI code to reset bus.

	 */

	{"HP", "C1750A", "3226", BLIST_NOLUN},		/* scanjet iic */

	{"HP", "C1790A", "", BLIST_NOLUN},		/* scanjet iip */

	{"HP", "C2500A", "", BLIST_NOLUN},		/* scanjet iicx */

	{"HP", "C1790A", NULL, BLIST_NOLUN},		/* scanjet iip */

	{"HP", "C2500A", NULL, BLIST_NOLUN},		/* scanjet iicx */

	{"MEDIAVIS", "CDR-H93MV", "1.31", BLIST_NOLUN},	/* locks up */

	{"MICROTEK", "ScanMaker II", "5.61", BLIST_NOLUN},	/* responds to all lun */

	{"MITSUMI", "CD-R CR-2201CS", "6119", BLIST_NOLUN},	/* locks up */
@@ -120,7 +120,7 @@ static struct { 
	{"QUANTUM", "FIREBALL ST4.3S", "0F0C", BLIST_NOLUN},	/* locks up */

	{"RELISYS", "Scorpio", NULL, BLIST_NOLUN},	/* responds to all lun */

	{"SANKYO", "CP525", "6.64", BLIST_NOLUN},	/* causes failed REQ SENSE, extra reset */

	{"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN},

	{"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN | BLIST_BORKEN},

	{"transtec", "T5008", "0001", BLIST_NOREPORTLUN },

	{"YAMAHA", "CDR100", "1.00", BLIST_NOLUN},	/* locks up */

	{"YAMAHA", "CDR102", "1.00", BLIST_NOLUN},	/* locks up */
@@ -255,7 +255,6 @@ static struct { 
	{"ST650211", "CF", NULL, BLIST_RETRY_HWERROR},

	{"SUN", "T300", "*", BLIST_SPARSELUN},

	{"SUN", "T4", "*", BLIST_SPARSELUN},

	{"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN},

	{"Tornado-", "F4", "*", BLIST_NOREPORTLUN},

	{"TOSHIBA", "CDROM", NULL, BLIST_ISROM},

	{"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},