From patchwork Mon Aug 19 13:18:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 268211 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 4783B2C0240 for ; Mon, 19 Aug 2013 23:19:06 +1000 (EST) Received: by ozlabs.org (Postfix) id 3179F2C0156; Mon, 19 Aug 2013 23:18:38 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from pokefinder.org (sauhun.de [89.238.76.85]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB7342C014D for ; Mon, 19 Aug 2013 23:18:37 +1000 (EST) Received: from tn1376.telenec.de ([80.79.225.122]:44552 helo=localhost) by pokefinder.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1VBPLp-0006kQ-G7; Mon, 19 Aug 2013 15:18:29 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Subject: [PATCH] i2c: powermac: fix return path on error Date: Mon, 19 Aug 2013 15:18:15 +0200 Message-Id: <1376918295-6961-1-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 1.7.10.4 Cc: Wolfram Sang , linuxppc-dev@ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" We want to bail out immediately if i2c_add_adapter failed and not try to register child nodes with a nilled adapter structure. Signed-off-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt --- drivers/i2c/busses/i2c-powermac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 8dc90da..bb81773 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c @@ -446,6 +446,7 @@ static int i2c_powermac_probe(struct platform_device *dev) printk(KERN_ERR "i2c-powermac: Adapter %s registration " "failed\n", adapter->name); memset(adapter, 0, sizeof(*adapter)); + return rc; } printk(KERN_INFO "PowerMac i2c bus %s registered\n", adapter->name); @@ -455,7 +456,7 @@ static int i2c_powermac_probe(struct platform_device *dev) */ i2c_powermac_register_devices(adapter, bus); - return rc; + return 0; } static struct platform_driver i2c_powermac_driver = {