diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 15:29:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 15:29:23 -0800 |
| commit | 1309d4e68497184d2fd87e892ddf14076c2bda98 (patch) | |
| tree | 5cbd4ee54ccbeb8834d600700a48d4acaa559923 /drivers/ata/pata_marvell.c | |
| parent | 101142c37be8e5af9b847860219217e6b958c739 (diff) | |
| parent | 5410f729e331bd607d99057ece59f6d7866cd3dc (diff) | |
| download | linux-1309d4e68497184d2fd87e892ddf14076c2bda98.tar.bz2 | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: fix sparse warning in pata_acpi.c
ata: fix sparse warning in pata_marvell.c
ata: fix sparse warning in pata_jmicron.c
ata: fix sparse warning in pata_cs5536.c
ata: sparse fixes for pata_amd.c
pata_scc.c: add thaw ops
pata_cs5536.c bugfix
pata_legacy: don't call ata_host_detach() after initialization failure
ata: fix sparse warnings in sata_mv.c
ata: fix sparse warning in sata_via.c
ata: fix sparse warning in sata_promise.c
ata: fix sparse warning in ata_piix.c
ata: fix sparse warning in libata-core.c
ata: make ata_scsiop_inq_89 static in libata-scsi.c
Diffstat (limited to 'drivers/ata/pata_marvell.c')
| -rw-r--r-- | drivers/ata/pata_marvell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 9afc8a32b226..a81f25d87235 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -85,8 +85,8 @@ static int marvell_cable_detect(struct ata_port *ap) static void marvell_error_handler(struct ata_port *ap) { - return ata_bmdma_drive_eh(ap, marvell_pre_reset, ata_std_softreset, - NULL, ata_std_postreset); + ata_bmdma_drive_eh(ap, marvell_pre_reset, ata_std_softreset, NULL, + ata_std_postreset); } /* No PIO or DMA methods needed for this device */ |