From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934226Ab3DOIEj (ORCPT ); Mon, 15 Apr 2013 04:04:39 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:20932 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754224Ab3DOIEh (ORCPT ); Mon, 15 Apr 2013 04:04:37 -0400 From: Nicolas Ferre To: "David S. Miller" , CC: , , Jean-Christophe PLAGNIOL-VILLARD , , Nicolas Ferre Subject: [PATCH] net/macb: fix error return code in macb_probe() Date: Mon, 15 Apr 2013 10:04:33 +0200 Message-ID: <1366013073-22934-1-git-send-email-nicolas.ferre@atmel.com> X-Mailer: git-send-email 1.8.0 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Original-idea-by: Signed-off-by: Nicolas Ferre --- Hi, This fix was written originally for at91_ether.c and I found it interesting to adapt it to macb. Thanks to Wei Yongjun for finding it. Best regards, drivers/net/ethernet/cadence/macb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 7fd0e3e..6be513d 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1602,9 +1602,9 @@ static int __init macb_probe(struct platform_device *pdev) goto err_out_free_irq; } - if (macb_mii_init(bp) != 0) { + err = macb_mii_init(bp); + if (err) goto err_out_unregister_netdev; - } platform_set_drvdata(pdev, dev); -- 1.8.0