diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-03-09 09:41:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-01 07:49:54 -0400 |
| commit | 27c78b372d05e47bbd059c9bb003c6d716abff54 (patch) | |
| tree | 3d6880b48557689dbe67c88cca952636a4554c5b /drivers/ata/pata_marvell.c | |
| parent | 31daabda16063b64a99a526242add727601e43c3 (diff) | |
[libata reset-seq] build and merge fixes
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_marvell.c')
| -rw-r--r-- | drivers/ata/pata_marvell.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 8ab236c54823..837b7fe77dc7 100644 --- 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) | |||
| 53 | if ((pdev->device == 0x6145) && (ap->port_no == 0) && | 53 | if ((pdev->device == 0x6145) && (ap->port_no == 0) && |
| 54 | (!(devices & 0x10))) /* PATA enable ? */ | 54 | (!(devices & 0x10))) /* PATA enable ? */ |
| 55 | return -ENOENT; | 55 | return -ENOENT; |
| 56 | return ata_std_prereset(ap); | 56 | |
| 57 | return ata_std_prereset(ap, deadline); | ||
| 57 | } | 58 | } |
| 58 | 59 | ||
| 59 | static int marvell_cable_detect(struct ata_port *ap) | 60 | static int marvell_cable_detect(struct ata_port *ap) |