From ce704475067f5aea4502adc2f9a7c165d8e8bdd2 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 20 Nov 2012 08:44:46 +0530 Subject: [PATCH] --- yaml --- r: 345001 b: refs/heads/master c: e8e6f047e666a1682b59e52637a7acaa8a0b4c89 h: refs/heads/master i: 344999: af55f15805b039282c60251b496c355be6b33981 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65090.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index baa8adc88813..dae1e729129e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2e8ffc97029a1159ac83bce1933a7e539f16a9d +refs/heads/master: e8e6f047e666a1682b59e52637a7acaa8a0b4c89 diff --git a/trunk/drivers/mfd/tps65090.c b/trunk/drivers/mfd/tps65090.c index 9b79d6811cae..f95f7f6b846c 100644 --- a/trunk/drivers/mfd/tps65090.c +++ b/trunk/drivers/mfd/tps65090.c @@ -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;