summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-eh.c
diff options
context:
space:
mode:
authorTejun Heo2007-10-09 08:05:44 +0200
committerJeff Garzik2007-10-12 20:55:47 +0200
commit2b789108fc1dcba22050a7e6e29ae5ebaea427dd (patch)
tree1c241e249c388d956ad9771efacfd827a24ec41e /drivers/ata/libata-eh.c
parentahci: fix notification handling (diff)
downloadkernel-qcow2-linux-2b789108fc1dcba22050a7e6e29ae5ebaea427dd.tar.gz
kernel-qcow2-linux-2b789108fc1dcba22050a7e6e29ae5ebaea427dd.tar.xz
kernel-qcow2-linux-2b789108fc1dcba22050a7e6e29ae5ebaea427dd.zip
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 8aa61403303f..c0e9a42e6ae7 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,
tf.protocol = ATA_PROT_PIO;
err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE,
- buf, sectors * ATA_SECT_SIZE);
+ buf, sectors * ATA_SECT_SIZE, 0);
DPRINTK("EXIT, err_mask=%x\n", err_mask);
return err_mask;
@@ -1363,7 +1363,7 @@ static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc)
}
return ata_exec_internal(dev, &tf, cdb, DMA_FROM_DEVICE,
- sense_buf, SCSI_SENSE_BUFFERSIZE);
+ sense_buf, SCSI_SENSE_BUFFERSIZE, 0);
}
/**