From 317820416a84bbc77a02cf3a68e513aeef7b2499 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 17 May 2010 17:47:48 +0800
Subject: [PATCH] --- yaml --- r: 199063 b: refs/heads/master c:
 7e1ce34f25c984a93dc0a2d8c217f7f78516b376 h: refs/heads/master i:   199061:
 aa2872e1df4fec3e954e1eeabf62d3aa172a2112   199059:
 3b04525dd21e92331b959c974bb669e289f3d37d   199055:
 5cfad1bf8c8b2b2ec61bcc6db5023738c94deb71 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/leds/leds-lp3944.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8492897e4531..157980084cd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 569762ef3dcf8fc5aecdb059d8c0741b90fe1d17
+refs/heads/master: 7e1ce34f25c984a93dc0a2d8c217f7f78516b376
diff --git a/trunk/drivers/leds/leds-lp3944.c b/trunk/drivers/leds/leds-lp3944.c
index 8d5ecceba181..932a58da76c4 100644
--- a/trunk/drivers/leds/leds-lp3944.c
+++ b/trunk/drivers/leds/leds-lp3944.c
@@ -379,6 +379,7 @@ static int __devinit lp3944_probe(struct i2c_client *client,
 {
 	struct lp3944_platform_data *lp3944_pdata = client->dev.platform_data;
 	struct lp3944_data *data;
+	int err;
 
 	if (lp3944_pdata == NULL) {
 		dev_err(&client->dev, "no platform data\n");
@@ -401,9 +402,13 @@ static int __devinit lp3944_probe(struct i2c_client *client,
 
 	mutex_init(&data->lock);
 
-	dev_info(&client->dev, "lp3944 enabled\n");
+	err = lp3944_configure(client, data, lp3944_pdata);
+	if (err < 0) {
+		kfree(data);
+		return err;
+	}
 
-	lp3944_configure(client, data, lp3944_pdata);
+	dev_info(&client->dev, "lp3944 enabled\n");
 	return 0;
 }