Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Wed, 16 Sep 2009
 00:03:38 -0600
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id n8G63aoR030392	for
 <andy.sharp@lsi.com>; Tue, 15 Sep 2009 23:03:38 -0700
Received: from psmtp.com (na3sys009amx215.postini.com [74.125.149.55])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id n8G63Ytt004608	for
 <andy.sharp@lsi.com>; Tue, 15 Sep 2009 23:03:34 -0700 (PDT)
Received: from source ([78.24.191.182]) by na3sys009amx215.postini.com
 ([74.125.148.14]) with SMTP;	Wed, 16 Sep 2009 06:03:35 GMT
Received: from localhost.localdomain ([127.0.0.1]:40408 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1492286AbZIPGDO (ORCPT <rfc822;andy.sharp@lsi.com>);	Wed, 16 Sep
 2009 08:03:14 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 16 Sep 2009 08:02:57
 +0200 (CEST)
Received: from rs1.rw-gmbh.net ([213.239.201.58]:42231 "EHLO rs1.rw-gmbh.net"
	rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP	id S1492281AbZIPGCu
 (ORCPT <rfc822;linux-mips@linux-mips.org>);	Wed, 16 Sep 2009 08:02:50 +0200
Received: from pd951a7a4.dip0.t-ipconnect.de ([217.81.167.164]
 helo=localhost.localdomain)	by rs1.rw-gmbh.net with esmtpsa
 (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)	(Exim 4.69)	(envelope-from
 <ralf.roesch@rw-gmbh.de>)	id 1MnnbJ-0007Ss-KL	for linux-mips@linux-mips.org;
 Wed, 16 Sep 2009 08:02:45 +0200
From: Ralf Roesch <ralf.roesch@rw-gmbh.de>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Wed, 16 Sep 2009 00:01:20 -0600
Subject: [PATCH] MIPS: TXx9: Fix error handling / Fix for noenexisting
 gpio_remove.
Thread-Topic: [PATCH] MIPS: TXx9: Fix error handling / Fix for noenexisting
 gpio_remove.
Thread-Index: Aco2k2+rJa5LD1PYSIiL1fAOiX0mkA==
Message-ID: <1253080880-11123-1-git-send-email-ralf.roesch@rw-gmbh.de>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-neptune: 0/0/0.00/0
x-pstn-levels: (S:47.61805/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <ralf.roesch@rw-gmbh.de> [db-null] 
x-archive-position: 24038
x-ecartis-version: Ecartis v1.0.0
x-original-sender: ralf.roesch@rw-gmbh.de
x-list: linux-mips
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

error was introduced by commit 0385d1f3d394c6814be0b165c153fc3fc254469a

Signed-off-by: Ralf Roesch <ralf.roesch@rw-gmbh.de>
---
 arch/mips/txx9/generic/setup.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.=
c
index ed794c1..cff5578 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -835,7 +835,8 @@ void __init txx9_iocled_init(unsigned long baseaddr,
 out_pdev:
 	platform_device_put(pdev);
 out_gpio:
-	gpio_remove(&iocled->chip);
+	if (gpiochip_remove(&iocled->chip))
+		return;
 out_unmap:
 	iounmap(iocled->mmioaddr);
 out_free:
--=20
1.6.3.3


