X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fata%2Fpata_efar.c;h=d0f52e0349061779747fd622ce439a9a420463ca;hb=d4b2bab4f26345ea1803feb23ea92fbe3f6b77bc;hp=a3216850bba15e10938da4f2335f50e863b516e5;hpb=e389f9aec689209724105ae80a6c91fd2e747bc9;p=powerpc.git diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c index a3216850bb..d0f52e0349 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c @@ -27,12 +27,13 @@ /** * efar_pre_reset - Enable bits * @ap: Port + * @deadline: deadline jiffies for the operation * * Perform cable detection for the EFAR ATA interface. This is * different to the PIIX arrangement */ -static int efar_pre_reset(struct ata_port *ap) +static int efar_pre_reset(struct ata_port *ap, unsigned long deadline) { static const struct pci_bits efar_enable_bits[] = { { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ @@ -43,7 +44,7 @@ static int efar_pre_reset(struct ata_port *ap) if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) return -ENOENT; - return ata_std_prereset(ap); + return ata_std_prereset(ap, deadline); } /**