From 5abf7d08015536474e55c81f7cb6b6b50b1e3c89 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 13 Apr 2012 10:15:49 +0200 Subject: [PATCH] --- yaml --- r: 309678 b: refs/heads/master c: cc28e17100a6b051ef966de81bb2d4a97b2a6645 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/ab8500_charger.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 224e8160b590..c7b0b7cfea57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cd725a1de1df8e5a2d694abc1e6b6aad5ce7d06 +refs/heads/master: cc28e17100a6b051ef966de81bb2d4a97b2a6645 diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c index e2b4accbec88..79dc584a53ed 100644 --- a/trunk/drivers/power/ab8500_charger.c +++ b/trunk/drivers/power/ab8500_charger.c @@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev) /* get charger specific platform data */ plat_data = pdev->dev.platform_data; - di->pdata = plat_data->charger; - - if (!di->pdata) { + if (!plat_data || !plat_data->charger) { dev_err(di->dev, "no charger platform data supplied\n"); ret = -EINVAL; goto free_device_info; } + di->pdata = plat_data->charger; /* get battery specific platform data */ di->bat = plat_data->battery;