Minor modifications to the SMART-related ioctls in libata, in
compliance with the latest ATA pass thru spec (T10/04-262r7).
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
drivers/scsi/libata-scsi.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
--- sata-smart-2.6/drivers/scsi/libata-scsi.c.orig 2005-02-01
16:24:01.687622085 -0500
+++ sata-smart-2.6/drivers/scsi/libata-scsi.c 2005-02-01 16:49:18.213876086
-0500
@@ -109,14 +109,16 @@ int ata_cmd_ioctl(struct scsi_device *sc
return -ENOMEM;
scsi_cmd[1] = (4 << 1); /* PIO Data-in */
+ scsi_cmd[2] = 0x0e; /* no off.line or cc, read from dev,
+ block count in sector count field */
sreq->sr_data_direction = DMA_FROM_DEVICE;
} else {
scsi_cmd[1] = (3 << 1); /* Non-data */
+ /* scsi_cmd[2] is already 0 -- no off.line, cc, or data xfer */
sreq->sr_data_direction = DMA_NONE;
}
scsi_cmd[0] = ATA_16;
- scsi_cmd[2] = 0x1f; /* no off.line or cc, yes all registers */
scsi_cmd[4] = args[2];
if (args[0] == WIN_SMART) { /* hack -- ide driver does this too... */
@@ -179,7 +181,7 @@ int ata_task_ioctl(struct scsi_device *s
memset(scsi_cmd, 0, sizeof(scsi_cmd));
scsi_cmd[0] = ATA_16;
scsi_cmd[1] = (3 << 1); /* Non-data */
- scsi_cmd[2] = 0x1f; /* no off.line or cc, yes all registers */
+ /* scsi_cmd[2] is already 0 -- no off.line, cc, or data xfer */
scsi_cmd[4] = args[1];
scsi_cmd[6] = args[2];
scsi_cmd[8] = args[3];
--
John W. Linville
[EMAIL PROTECTED]
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
