summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-05-15 07:21:17 (GMT)
committerJeff Garzik <jeff@garzik.org>2007-05-16 05:18:30 (GMT)
commitd1c68fa6ce7e56e300d8561bb3b6492c336df863 (patch)
treef0ca29ef45ad5f68164ee3210eb529ad8452be02 /drivers/ata
parent7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 (diff)
downloadlinux-d1c68fa6ce7e56e300d8561bb3b6492c336df863.tar.xz
pata_scc had been missed by ata_std_prereset() switch
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_scc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index cca3aa2..844e53b 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -864,10 +864,10 @@ static void scc_bmdma_freeze (struct ata_port *ap)
* @ap: ATA port to be reset
*/
-static int scc_pata_prereset (struct ata_port *ap)
+static int scc_pata_prereset (struct ata_port *ap, unsigned long deadline)
{
ap->cbl = ATA_CBL_PATA80;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap, deadline);
}
/**