From 7e3c651eaf04d62a49d3a9ea98d1de758fce8342 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 13 Apr 2012 10:16:13 +0200 Subject: [PATCH] --- yaml --- r: 309680 b: refs/heads/master c: 5f98eb393c6d7a5de3202b7ce9e4439292e952fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/ab8500_fg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f11280a8bf76..c311c14b0b74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec511672b97383107d87e86921b1f0392bc1d000 +refs/heads/master: 5f98eb393c6d7a5de3202b7ce9e4439292e952fb diff --git a/trunk/drivers/power/ab8500_fg.c b/trunk/drivers/power/ab8500_fg.c index c22f2f05657e..0ebea39e73fe 100644 --- a/trunk/drivers/power/ab8500_fg.c +++ b/trunk/drivers/power/ab8500_fg.c @@ -2462,12 +2462,12 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev) /* get fg specific platform data */ plat_data = pdev->dev.platform_data; - di->pdata = plat_data->fg; - if (!di->pdata) { + if (!plat_data || !plat_data->fg) { dev_err(di->dev, "no fg platform data supplied\n"); ret = -EINVAL; goto free_device_info; } + di->pdata = plat_data->fg; /* get battery specific platform data */ di->bat = plat_data->battery;