From patchwork Wed Mar 20 12:21:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 229371 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4214C2C009E for ; Wed, 20 Mar 2013 23:21:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758024Ab3CTMVu (ORCPT ); Wed, 20 Mar 2013 08:21:50 -0400 Received: from mail-bk0-f52.google.com ([209.85.214.52]:54890 "EHLO mail-bk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756568Ab3CTMVt (ORCPT ); Wed, 20 Mar 2013 08:21:49 -0400 Received: by mail-bk0-f52.google.com with SMTP id jk13so799213bkc.11 for ; Wed, 20 Mar 2013 05:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=LPWFwTL7+4i+tiaz0zjbkCWVbeAmddClUHLEMsnOVuU=; b=rRsAWIT27BB2gViosPFGg2F8zMHg3YGlKB5vXMwVpOiR2jkEMCYAUXBzsridpSX+xH TyA02/awbS0lu8I8A/9co6q8H2K0p4pgJB/skKRh6TlVWRTwIHmlGNfFFPr5po+GtIJ8 /4jNhG5Dm3iHwnUcA2e7OapaEX+poYHg6sc4EwpCAKUI10wumOilGl8QSopV9L6EuYeN 0Y3XY7I1gbOroQXfKM2WkKoNx3O9FL5XAGNhLKnHGDrG9y2VnJBptmZBulwX+NQA/u8f JMju9OB6LPvLKFHgi3YdNYWm+O3IHFfcxgL2JiUGemMueWzkxbHzrx6STkbIHdzDCcK2 g3JQ== MIME-Version: 1.0 X-Received: by 10.204.243.3 with SMTP id lk3mr10655106bkb.38.1363782108548; Wed, 20 Mar 2013 05:21:48 -0700 (PDT) Received: by 10.204.30.210 with HTTP; Wed, 20 Mar 2013 05:21:48 -0700 (PDT) Date: Wed, 20 Mar 2013 20:21:48 +0800 Message-ID: Subject: [PATCH -next] lpc_eth: fix error return code in lpc_eth_drv_probe() From: Wei Yongjun To: grant.likely@secretlab.ca, rob.herring@calxeda.com, davem@davemloft.net, stigge@antcom.de, edumazet@google.com, gregkh@linuxfoundation.org, jiri@resnulli.us Cc: yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun --- drivers/net/ethernet/nxp/lpc_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 9c88c00..89d1b0e 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c @@ -1470,7 +1470,8 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, ndev); - if (lpc_mii_init(pldat) != 0) + ret = lpc_mii_init(pldat); + if (ret) goto err_out_unregister_netdev; netdev_info(ndev, "LPC mac at 0x%08x irq %d\n",