projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b104bc
)
pata_scc had been missed by ata_std_prereset() switch
author
Al Viro
<viro@ftp.linux.org.uk>
Tue, 15 May 2007 07:21:17 +0000
(08:21 +0100)
committer
Jeff Garzik
<jeff@garzik.org>
Wed, 16 May 2007 05:18:30 +0000
(
01:18
-0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/pata_scc.c
patch
|
blob
|
history
diff --git
a/drivers/ata/pata_scc.c
b/drivers/ata/pata_scc.c
index
cca3aa2
..
844e53b
100644
(file)
--- 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
);
}
/**