diff options
Diffstat (limited to 'drivers/ata/pata_opti.c')
-rw-r--r-- | drivers/ata/pata_opti.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c index 13b63e21838d..0af8a2c77cc9 100644 --- a/drivers/ata/pata_opti.c +++ b/drivers/ata/pata_opti.c | |||
@@ -47,11 +47,12 @@ enum { | |||
47 | /** | 47 | /** |
48 | * opti_pre_reset - probe begin | 48 | * opti_pre_reset - probe begin |
49 | * @ap: ATA port | 49 | * @ap: ATA port |
50 | * @deadline: deadline jiffies for the operation | ||
50 | * | 51 | * |
51 | * Set up cable type and use generic probe init | 52 | * Set up cable type and use generic probe init |
52 | */ | 53 | */ |
53 | 54 | ||
54 | static int opti_pre_reset(struct ata_port *ap) | 55 | static int opti_pre_reset(struct ata_port *ap, unsigned long deadline) |
55 | { | 56 | { |
56 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 57 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
57 | static const struct pci_bits opti_enable_bits[] = { | 58 | static const struct pci_bits opti_enable_bits[] = { |
@@ -61,7 +62,8 @@ static int opti_pre_reset(struct ata_port *ap) | |||
61 | 62 | ||
62 | if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no])) | 63 | if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no])) |
63 | return -ENOENT; | 64 | return -ENOENT; |
64 | return ata_std_prereset(ap); | 65 | |
66 | return ata_std_prereset(ap, deadline); | ||
65 | } | 67 | } |
66 | 68 | ||
67 | /** | 69 | /** |