diff options
Diffstat (limited to 'drivers/ata/ata_piix.c')
-rw-r--r-- | drivers/ata/ata_piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 55d306a3e538..4a795fdb6a02 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -625,17 +625,18 @@ static int ich_pata_cable_detect(struct ata_port *ap) | |||
625 | /** | 625 | /** |
626 | * piix_pata_prereset - prereset for PATA host controller | 626 | * piix_pata_prereset - prereset for PATA host controller |
627 | * @ap: Target port | 627 | * @ap: Target port |
628 | * @deadline: deadline jiffies for the operation | ||
628 | * | 629 | * |
629 | * LOCKING: | 630 | * LOCKING: |
630 | * None (inherited from caller). | 631 | * None (inherited from caller). |
631 | */ | 632 | */ |
632 | static int piix_pata_prereset(struct ata_port *ap) | 633 | static int piix_pata_prereset(struct ata_port *ap, unsigned long deadline) |
633 | { | 634 | { |
634 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 635 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
635 | 636 | ||
636 | if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) | 637 | if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) |
637 | return -ENOENT; | 638 | return -ENOENT; |
638 | return ata_std_prereset(ap); | 639 | return ata_std_prereset(ap, deadline); |
639 | } | 640 | } |
640 | 641 | ||
641 | static void piix_pata_error_handler(struct ata_port *ap) | 642 | static void piix_pata_error_handler(struct ata_port *ap) |
@@ -644,7 +645,6 @@ static void piix_pata_error_handler(struct ata_port *ap) | |||
644 | ata_std_postreset); | 645 | ata_std_postreset); |
645 | } | 646 | } |
646 | 647 | ||
647 | |||
648 | static void piix_sata_error_handler(struct ata_port *ap) | 648 | static void piix_sata_error_handler(struct ata_port *ap) |
649 | { | 649 | { |
650 | ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL, | 650 | ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL, |