diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 08:28:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 08:28:49 +0400 |
| commit | b2cd64153b94473f6bd82448a68b8e8c041676ea (patch) | |
| tree | 327778fbc139079921eeb73bebf10af4327f79c8 /drivers/ata/pata_scc.c | |
| parent | b17bfca5f16a6090ee51250163e1720f6fe71515 (diff) | |
| parent | 13b8d09f5de0aaa3153bbccc98baf247387823dc (diff) | |
| download | linux-b2cd64153b94473f6bd82448a68b8e8c041676ea.tar.xz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: track spindown status and skip spindown_compat if possible
libata: fix shutdown warning message printing
libata-acpi: add ATA_FLAG_ACPI_SATA port flag
libata: during revalidation, check n_sectors after device is configured
libata: separate out ata_dev_reread_id()
pata_scc had been missed by ata_std_prereset() switch
Diffstat (limited to 'drivers/ata/pata_scc.c')
| -rw-r--r-- | drivers/ata/pata_scc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index cca3aa225efe..844e53b280c7 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c @@ -864,10 +864,10 @@ static void scc_bmdma_freeze (struct ata_port *ap) * @ap: ATA port to be reset */ -static int scc_pata_prereset (struct ata_port *ap) +static int scc_pata_prereset (struct ata_port *ap, unsigned long deadline) { ap->cbl = ATA_CBL_PATA80; - return ata_std_prereset(ap); + return ata_std_prereset(ap, deadline); } /** |