aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/ab8500_btemp.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-04-13 04:16:06 -0400
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-05-05 06:59:47 -0400
commitec511672b97383107d87e86921b1f0392bc1d000 (patch)
tree938e81a3e423ed76410d844eac9699bdddda4e04 /drivers/power/ab8500_btemp.c
parentcc28e17100a6b051ef966de81bb2d4a97b2a6645 (diff)
ab8500_btemp: Harden platform data check
If no platform data at all is supplied the driver crashes, extend the checks to be more careful so we can compile in the driver and boot also without platform data present. Acked-by: Arun Murthy <arun.murthy@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power/ab8500_btemp.c')
-rw-r--r--drivers/power/ab8500_btemp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index d8bb99394ac0..e266f038a110 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -978,12 +978,12 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
978 978
979 /* get btemp specific platform data */ 979 /* get btemp specific platform data */
980 plat_data = pdev->dev.platform_data; 980 plat_data = pdev->dev.platform_data;
981 di->pdata = plat_data->btemp; 981 if (!plat_data || !plat_data->btemp) {
982 if (!di->pdata) {
983 dev_err(di->dev, "no btemp platform data supplied\n"); 982 dev_err(di->dev, "no btemp platform data supplied\n");
984 ret = -EINVAL; 983 ret = -EINVAL;
985 goto free_device_info; 984 goto free_device_info;
986 } 985 }
986 di->pdata = plat_data->btemp;
987 987
988 /* get battery specific platform data */ 988 /* get battery specific platform data */
989 di->bat = plat_data->battery; 989 di->bat = plat_data->battery;