From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sun, 20 Apr 2008 16:05:31 +0000 (+0200)
Subject: korina: fix misplaced return statement
X-Git-Tag: v2.6.26-rc1~1067^2~1^2~14
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=751c2e4755027468a79349f8e9f4885a4518426e;hp=d753d82405ac3504ed69fb6be4d219d9702b8d64;p=linux-2.6-omap-h63xx.git

korina: fix misplaced return statement

The driver takes the error unwind path without condition.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 1d24a73a0e1..305be624252 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -1031,6 +1031,8 @@ static int korina_open(struct net_device *dev)
 		    dev->name, lp->und_irq);
 		goto err_free_ovr_irq;
 	}
+out:
+	return ret;
 
 err_free_ovr_irq:
 	free_irq(lp->ovr_irq, dev);
@@ -1041,8 +1043,6 @@ err_free_rx_irq:
 err_release:
 	korina_free_ring(dev);
 	goto out;
-out:
-	return ret;
 }
 
 static int korina_close(struct net_device *dev)