# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/08/18 01:30:57-04:00 dougg@torque.net 
#   [libata] fix INQUIRY handling
#   
#   
#   Changes:
#      - send vendor, product and rev strings back for 36 byte
#        INQUIRYs
#      - set the additional length field to indicate 96 byte
#        response is available 
# 
# drivers/scsi/libata-scsi.c
#   2004/08/18 01:30:53-04:00 dougg@torque.net +2 -2
#   [libata] fix INQUIRY handling
#   
#   
#   Changes:
#      - send vendor, product and rev strings back for 36 byte
#        INQUIRYs
#      - set the additional length field to indicate 96 byte
#        response is available 
# 
diff -Nru a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/libata-scsi.c	2004-08-19 13:48:25 -07:00
+++ b/drivers/scsi/libata-scsi.c	2004-08-19 13:48:25 -07:00
@@ -652,7 +652,7 @@
 		0,
 		0x5,	/* claim SPC-3 version compatibility */
 		2,
-		96 - 4
+		95 - 4
 	};
 
 	/* set scsi removeable (RMB) bit per ata bit */
@@ -663,7 +663,7 @@
 
 	memcpy(rbuf, hdr, sizeof(hdr));
 
-	if (buflen > 36) {
+	if (buflen > 35) {
 		memcpy(&rbuf[8], "ATA     ", 8);
 		ata_dev_id_string(dev, &rbuf[16], ATA_ID_PROD_OFS, 16);
 		ata_dev_id_string(dev, &rbuf[32], ATA_ID_FW_REV_OFS, 4);