diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/ata/pata_ns87410.c | |
| parent | [WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
| download | linux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/pata_ns87410.c')
| -rw-r--r-- | drivers/ata/pata_ns87410.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 078aeda9cf8d..ebc58a907d26 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c @@ -33,11 +33,12 @@ /** * ns87410_pre_reset - probe begin * @ap: ATA port + * @deadline: deadline jiffies for the operation * * Check enabled ports */ -static int ns87410_pre_reset(struct ata_port *ap) +static int ns87410_pre_reset(struct ata_port *ap, unsigned long deadline) { struct pci_dev *pdev = to_pci_dev(ap->host->dev); static const struct pci_bits ns87410_enable_bits[] = { @@ -47,7 +48,8 @@ static int ns87410_pre_reset(struct ata_port *ap) if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) return -ENOENT; - return ata_std_prereset(ap); + + return ata_std_prereset(ap, deadline); } /** |