projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-fixes' into fixes
[powerpc.git]
/
drivers
/
ata
/
pata_pdc2027x.c
diff --git
a/drivers/ata/pata_pdc2027x.c
b/drivers/ata/pata_pdc2027x.c
index
a61cbc1
..
0d2cc49
100644
(file)
--- a/
drivers/ata/pata_pdc2027x.c
+++ b/
drivers/ata/pata_pdc2027x.c
@@
-301,6
+301,7
@@
static inline int pdc2027x_port_enabled(struct ata_port *ap)
/**
* pdc2027x_prereset - prereset for PATA host controller
* @ap: Target port
/**
* pdc2027x_prereset - prereset for PATA host controller
* @ap: Target port
+ * @deadline: deadline jiffies for the operation
*
* Probeinit including cable detection.
*
*
* Probeinit including cable detection.
*
@@
-308,12
+309,12
@@
static inline int pdc2027x_port_enabled(struct ata_port *ap)
* None (inherited from caller).
*/
* None (inherited from caller).
*/
-static int pdc2027x_prereset(struct ata_port *ap)
+static int pdc2027x_prereset(struct ata_port *ap
, unsigned long deadline
)
{
/* Check whether port enabled */
if (!pdc2027x_port_enabled(ap))
return -ENOENT;
{
/* Check whether port enabled */
if (!pdc2027x_port_enabled(ap))
return -ENOENT;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap
, deadline
);
}
/**
}
/**