[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1314686257.3270.2.camel@phoenix>
Date: Tue, 30 Aug 2011 14:37:37 +0800
From: Axel Lin <axel.lin@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Dirk Brandewie <dirk.brandewie@...il.com>,
Jean Delvare <khali@...ux-fr.org>,
Ben Dooks <ben-linux@...ff.org>, linux-i2c@...r.kernel.org
Subject: [PATCH RESEND] i2c-pxa2xx: return proper error code in
ce4100_i2c_probe error paths
Signed-off-by: Axel Lin <axel.lin@...il.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
---
Hi Ben,
Seems this patch is not yet upstream. Here is the resend.
Axel
drivers/i2c/busses/i2c-pxa-pci.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index 6659d26..b73da6c 100644
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -109,12 +109,15 @@ static int __devinit ce4100_i2c_probe(struct pci_dev *dev,
return -EINVAL;
}
sds = kzalloc(sizeof(*sds), GFP_KERNEL);
- if (!sds)
+ if (!sds) {
+ ret = -ENOMEM;
goto err_mem;
+ }
for (i = 0; i < ARRAY_SIZE(sds->pdev); i++) {
sds->pdev[i] = add_i2c_device(dev, i);
if (IS_ERR(sds->pdev[i])) {
+ ret = PTR_ERR(sds->pdev[i]);
while (--i >= 0)
platform_device_unregister(sds->pdev[i]);
goto err_dev_add;
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists