diff mbox

[2/3] power/ab8500_btemp: harden platform data check

Message ID 1334304966-18342-1-git-send-email-linus.walleij@stericsson.com
State Accepted
Commit ec511672b97383107d87e86921b1f0392bc1d000
Headers show

Commit Message

Linus Walleij April 13, 2012, 8:16 a.m. UTC 
From: Linus Walleij <linus.walleij@linaro.org>

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.

Cc: Arun Murthy <arun.murthy@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/power/ab8500_btemp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index d8bb993..e266f03 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)
 
 	/* get btemp specific platform data */
 	plat_data = pdev->dev.platform_data;
-	di->pdata = plat_data->btemp;
-	if (!di->pdata) {
+	if (!plat_data || !plat_data->btemp) {
 		dev_err(di->dev, "no btemp platform data supplied\n");
 		ret = -EINVAL;
 		goto free_device_info;
 	}
+	di->pdata = plat_data->btemp;
 
 	/* get battery specific platform data */
 	di->bat = plat_data->battery;