diff options
| author | Dane Liu <danel@nvidia.com> | 2014-02-12 17:51:44 +0800 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2014-02-18 01:02:19 -0800 |
| commit | ac7b2d827dce74fc973a254a95fd7b4a85509c52 (patch) | |
| tree | b6075317f2729e507623375dab9f92a3c4902e12 /drivers/power | |
| parent | 901fb3c6915a177e8bd9f5dfe120f8be8b774027 (diff) | |
power: bq2471x: fix a NULL pointer
Remove a redundant memory allocation, which makes
bq2471x->dev a NULL pointer
bug 1448568
Change-Id: Ia8c5b92b39eff2c918aa6f618abb010cc08c44da
Reviewed-on: http://git-master/r/366467
(cherry picked from commit 04cb5431b6f01b859c0ce536fde41a22c4e49964)
Signed-off-by: Dane Liu <danel@nvidia.com>
Reviewed-on: http://git-master/r/367559
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/bq2471x-charger.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/power/bq2471x-charger.c b/drivers/power/bq2471x-charger.c index b7a906b51004..d77b8da9a0b3 100644 --- a/drivers/power/bq2471x-charger.c +++ b/drivers/power/bq2471x-charger.c @@ -1,7 +1,7 @@ /* * bq2471x-charger.c -- BQ24715 Charger driver * - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * Author: Andy Park <andyp@nvidia.com> * Author: Syed Rafiuddin <srafiuddin@nvidia.com> @@ -353,13 +353,6 @@ static int bq2471x_probe(struct i2c_client *client, msleep(20); - bq2471x = devm_kzalloc(&client->dev, sizeof(*bq2471x), GFP_KERNEL); - if (!bq2471x) { - dev_err(&client->dev, "Memory allocation failed\n"); - ret = -ENOMEM; - goto gpio_err; - } - bq2471x->dac_ichg = pdata->dac_ichg; bq2471x->dac_v = pdata->dac_v; bq2471x->dac_minsv = pdata->dac_minsv; |