Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345001
b: refs/heads/master
c: e8e6f04
h: refs/heads/master
i:
  344999: af55f15
v: v3
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed Nov 21, 2012
1 parent 94431c9 commit ce70447
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: e2e8ffc97029a1159ac83bce1933a7e539f16a9d
refs/heads/master: e8e6f047e666a1682b59e52637a7acaa8a0b4c89
7 changes: 4 additions & 3 deletions trunk/drivers/mfd/tps65090.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,11 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
return -EINVAL;
}

tps65090 = devm_kzalloc(&client->dev, sizeof(struct tps65090),
GFP_KERNEL);
if (tps65090 == NULL)
tps65090 = devm_kzalloc(&client->dev, sizeof(*tps65090), GFP_KERNEL);
if (!tps65090) {
dev_err(&client->dev, "mem alloc for tps65090 failed\n");
return -ENOMEM;
}

tps65090->client = client;
tps65090->dev = &client->dev;
Expand Down

0 comments on commit ce70447

Please sign in to comment.