git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
drivers
/
leds
/
leds-lp3944.c
diff --git
a/drivers/leds/leds-lp3944.c
b/drivers/leds/leds-lp3944.c
index
8d5ecce
..
932a58d
100644
(file)
--- a/
drivers/leds/leds-lp3944.c
+++ b/
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;
{
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");
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);
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;
}
return 0;
}