summaryrefslogtreecommitdiff
path: root/drivers/ata/pata_artop.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-03-09 17:41:19 +0300
committerJeff Garzik <jeff@garzik.org>2007-05-01 15:49:54 +0400
commit27c78b372d05e47bbd059c9bb003c6d716abff54 (patch)
tree3d6880b48557689dbe67c88cca952636a4554c5b /drivers/ata/pata_artop.c
parent31daabda16063b64a99a526242add727601e43c3 (diff)
downloadlinux-27c78b372d05e47bbd059c9bb003c6d716abff54.tar.xz
[libata reset-seq] build and merge fixes
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_artop.c')
-rw-r--r--drivers/ata/pata_artop.c3
1 files changed, 2 insertions, 1 deletions
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);
}
/**