From 35c5e4a4ee79f12ec764b93db807b2e4497b5087 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 13 Feb 2008 21:14:29 -0800 Subject: [PATCH] --- yaml --- r: 85687 b: refs/heads/master c: 42268e26aa9d2b6d0d1f890c354447f185fc2624 h: refs/heads/master i: 85685: 9777378d85407171d67bd7ce0652d44c04d11ec1 85683: a619631a42fa6e78b231389a6dc7644a4c0807b2 85679: 2bd023c959f1857dc7d2206be2c5ab3348698728 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_marvell.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31ffa5cdbe30..a5c2ed46fd52 100644 --- 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 index 9afc8a32b226..a81f25d87235 100644 --- 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 */