From: Wang Chen <wangchen@cn.fujitsu.com>
Date: Fri, 26 Sep 2008 08:20:32 +0000 (+0800)
Subject: skge: Fix skge_set_ring_param() losing error return
X-Git-Tag: v2.6.28-rc1~717^2~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e824b3eb4acad16c64c9ddf8e63b63e2469259b0;p=linux-2.6-omap-h63xx.git

skge: Fix skge_set_ring_param() losing error return

The error return is useful to caller, driver shouldn't miss it.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 3bca52c142f..43f4c730be4 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -501,7 +501,7 @@ static int skge_set_ring_param(struct net_device *dev,
 			       struct ethtool_ringparam *p)
 {
 	struct skge_port *skge = netdev_priv(dev);
-	int err;
+	int err = 0;
 
 	if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE ||
 	    p->tx_pending < TX_LOW_WATER || p->tx_pending > MAX_TX_RING_SIZE)
@@ -517,7 +517,7 @@ static int skge_set_ring_param(struct net_device *dev,
 			dev_close(dev);
 	}
 
-	return 0;
+	return err;
 }
 
 static u32 skge_get_msglevel(struct net_device *netdev)