Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / sata_via.c

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 30caa033719039c73350fee395c30fd6f374bc24..0d03f44824fb216545dcef8a0cf52f11efb4a324 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -333,8 +333,8 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)
 
 static void vt6420_error_handler(struct ata_port *ap)
 {
-       return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
-                                 NULL, ata_std_postreset);
+       ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset, NULL,
+                          ata_std_postreset);
 }
 
 static int vt6421_pata_cable_detect(struct ata_port *ap)