Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199063
b: refs/heads/master
c: 7e1ce34
h: refs/heads/master
i:
  199061: aa2872e
  199059: 3b04525
  199055: 5cfad1b
v: v3
  • Loading branch information
Axel Lin authored and Richard Purdie committed May 26, 2010
1 parent ff41847 commit 3178204
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 569762ef3dcf8fc5aecdb059d8c0741b90fe1d17
refs/heads/master: 7e1ce34f25c984a93dc0a2d8c217f7f78516b376
9 changes: 7 additions & 2 deletions trunk/drivers/leds/leds-lp3944.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
}

Expand Down

0 comments on commit 3178204

Please sign in to comment.