git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[libata reset-seq] build and merge fixes
[sfrench/cifs-2.6.git]
/
drivers
/
ata
/
pata_marvell.c
diff --git
a/drivers/ata/pata_marvell.c
b/drivers/ata/pata_marvell.c
index 8ab236c54823c828d60832c0c1f4d501e8653458..837b7fe77dc7ff1e4a97b6265e91a22d28afa1c1 100644
(file)
--- a/
drivers/ata/pata_marvell.c
+++ b/
drivers/ata/pata_marvell.c
@@
-53,7
+53,8
@@
static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline)
if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
(!(devices & 0x10))) /* PATA enable ? */
return -ENOENT;
- return ata_std_prereset(ap);
+
+ return ata_std_prereset(ap, deadline);
}
static int marvell_cable_detect(struct ata_port *ap)