Patchwork skge: Fix skge_set_ring_param() losing error return

login
register
mail settings
Submitter Wang Chen
Date Sept. 26, 2008, 8:32 a.m.
Message ID <48DC9E32.503@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/1631/
State Accepted
Delegated to: Jeff Garzik
Headers show

Comments

Wang Chen - Sept. 26, 2008, 8:32 a.m.
From: Wang Chen <wangchen@cn.fujitsu.com>
Date: Fri, 26 Sep 2008 16:20:32 +0800
Subject: [PATCH] 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>
---
 drivers/net/skge.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 2e26dce..4c333a1 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -494,7 +494,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)
@@ -510,7 +510,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)