aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-eh.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-10-09 02:05:44 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:47 -0400
commit2b789108fc1dcba22050a7e6e29ae5ebaea427dd (patch)
tree1c241e249c388d956ad9771efacfd827a24ec41e /drivers/ata/libata-eh.c
parent5f226c6bf78edab023ed1ea679531731d9df92a6 (diff)
libata: add @timeout to ata_exec_internal[_sg]()
Add @timeout argument to ata_exec_internal[_sg](). If 0, default timeout ata_probe_timeout is used. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r--drivers/ata/libata-eh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 8aa61403303..c0e9a42e6ae 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1249,7 +1249,7 @@ static unsigned int ata_read_log_page(struct ata_device *dev,
1249 tf.protocol = ATA_PROT_PIO; 1249 tf.protocol = ATA_PROT_PIO;
1250 1250
1251 err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE, 1251 err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE,
1252 buf, sectors * ATA_SECT_SIZE); 1252 buf, sectors * ATA_SECT_SIZE, 0);
1253 1253
1254 DPRINTK("EXIT, err_mask=%x\n", err_mask); 1254 DPRINTK("EXIT, err_mask=%x\n", err_mask);
1255 return err_mask; 1255 return err_mask;
@@ -1363,7 +1363,7 @@ static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc)
1363 } 1363 }
1364 1364
1365 return ata_exec_internal(dev, &tf, cdb, DMA_FROM_DEVICE, 1365 return ata_exec_internal(dev, &tf, cdb, DMA_FROM_DEVICE,
1366 sense_buf, SCSI_SENSE_BUFFERSIZE); 1366 sense_buf, SCSI_SENSE_BUFFERSIZE, 0);
1367} 1367}
1368 1368
1369/** 1369/**