netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] amd-xgbe: Fix error return code in xgbe_probe()
@ 2014-07-23  0:59 weiyj_lk
  2014-07-23 13:25 ` Tom Lendacky
  2014-07-23 21:55 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: weiyj_lk @ 2014-07-23  0:59 UTC (permalink / raw)
  To: Tom Lendacky, Grant Likely, Rob Herring; +Cc: Wei Yongjun, netdev

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Fix to return a negative error code from the setting real tx queue
count error handling case instead of 0.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index c83584a..5a1891f 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -339,7 +339,8 @@ static int xgbe_probe(struct platform_device *pdev)
 	/* Calculate the number of Tx and Rx rings to be created */
 	pdata->tx_ring_count = min_t(unsigned int, num_online_cpus(),
 				     pdata->hw_feat.tx_ch_cnt);
-	if (netif_set_real_num_tx_queues(netdev, pdata->tx_ring_count)) {
+	ret = netif_set_real_num_tx_queues(netdev, pdata->tx_ring_count);
+	if (ret) {
 		dev_err(dev, "error setting real tx queue count\n");
 		goto err_io;
 	}

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] amd-xgbe: Fix error return code in xgbe_probe()
  2014-07-23  0:59 [PATCH] amd-xgbe: Fix error return code in xgbe_probe() weiyj_lk
@ 2014-07-23 13:25 ` Tom Lendacky
  2014-07-23 21:55 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Lendacky @ 2014-07-23 13:25 UTC (permalink / raw)
  To: weiyj_lk, Grant Likely, Rob Herring; +Cc: Wei Yongjun, netdev

On 07/22/2014 07:59 PM, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Fix to return a negative error code from the setting real tx queue
> count error handling case instead of 0.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
>   drivers/net/ethernet/amd/xgbe/xgbe-main.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
> index c83584a..5a1891f 100644
> --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
> +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
> @@ -339,7 +339,8 @@ static int xgbe_probe(struct platform_device *pdev)
>   	/* Calculate the number of Tx and Rx rings to be created */
>   	pdata->tx_ring_count = min_t(unsigned int, num_online_cpus(),
>   				     pdata->hw_feat.tx_ch_cnt);
> -	if (netif_set_real_num_tx_queues(netdev, pdata->tx_ring_count)) {
> +	ret = netif_set_real_num_tx_queues(netdev, pdata->tx_ring_count);
> +	if (ret) {
>   		dev_err(dev, "error setting real tx queue count\n");
>   		goto err_io;
>   	}
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] amd-xgbe: Fix error return code in xgbe_probe()
  2014-07-23  0:59 [PATCH] amd-xgbe: Fix error return code in xgbe_probe() weiyj_lk
  2014-07-23 13:25 ` Tom Lendacky
@ 2014-07-23 21:55 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-07-23 21:55 UTC (permalink / raw)
  To: weiyj_lk; +Cc: thomas.lendacky, grant.likely, robh+dt, yongjun_wei, netdev

From: weiyj_lk@163.com
Date: Wed, 23 Jul 2014 08:59:40 +0800

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix to return a negative error code from the setting real tx queue
> count error handling case instead of 0.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-07-23 21:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-23  0:59 [PATCH] amd-xgbe: Fix error return code in xgbe_probe() weiyj_lk
2014-07-23 13:25 ` Tom Lendacky
2014-07-23 21:55 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).