---

yaml --- r: 85687 b: refs/heads/master c: 42268e2 h: refs/heads/master i: 85685: 9777378 85683: a619631 85679: 2bd023c v: v3
git-mirror · Feb 15, 2008 · 35c5e4a · 35c5e4a
1 parent 3801eeb
commit 35c5e4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef2f2e4911654f0bc3b432b3d27e7c4d992efb7b
+refs/heads/master: 42268e26aa9d2b6d0d1f890c354447f185fc2624
diff --git a/trunk/drivers/ata/pata_marvell.c b/trunk/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 */