From dd6db8bcdd1c77ac3340cd4292185c12ff31ffad Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 13 Apr 2012 10:16:06 +0200
Subject: [PATCH] --- yaml --- r: 309679 b: refs/heads/master c:
 ec511672b97383107d87e86921b1f0392bc1d000 h: refs/heads/master i:   309677:
 b7747a444eb18e60b7425e40e1ce7bc8830ffed7   309675:
 06466ac3e07a07d024e89be77c84d0944fcde590   309671:
 6f6d1f984f7c28e5205008f2b050e75a128eb405   309663:
 a9e9a2677d95bbcafe828494b8e1eeb92f2c0293 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/power/ab8500_btemp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c7b0b7cfea57..f11280a8bf76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc28e17100a6b051ef966de81bb2d4a97b2a6645
+refs/heads/master: ec511672b97383107d87e86921b1f0392bc1d000
diff --git a/trunk/drivers/power/ab8500_btemp.c b/trunk/drivers/power/ab8500_btemp.c
index d8bb99394ac0..e266f038a110 100644
--- a/trunk/drivers/power/ab8500_btemp.c
+++ b/trunk/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;