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;