X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fata%2Fsata_via.c;h=c0e0f1d18d50a38901596dda1de68d089b3b6487;hb=8cebf274dd1c955a6e03385a85fd6569ce445946;hp=30caa033719039c73350fee395c30fd6f374bc24;hpb=3e6bdf473f489664dac4d7511d26c7ac3dfdc748;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 30caa033719..c0e0f1d18d5 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -320,7 +320,7 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)
 
 	if (!online) {
 		/* tell EH to bail */
-		ehc->i.action &= ~ATA_EH_RESET_MASK;
+		ehc->i.action &= ~ATA_EH_RESET;
 		return 0;
 	}
 
@@ -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)