From 27c78b372d05e47bbd059c9bb003c6d716abff54 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 9 Mar 2007 09:41:19 -0500 Subject: [libata reset-seq] build and merge fixes Signed-off-by: Jeff Garzik --- drivers/ata/pata_artop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/ata/pata_artop.c') diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c index d472894a983b..ef51940c3adb 100644 --- a/drivers/ata/pata_artop.c +++ b/drivers/ata/pata_artop.c @@ -89,7 +89,8 @@ static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline) /* Odd numbered device ids are the units with enable bits (the -R cards) */ if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) return -ENOENT; - return ata_std_prereset(ap); + + return ata_std_prereset(ap, deadline); } /** -- cgit v1.2.3