diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/power/ab8500_charger.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index e2b4accbec88..79dc584a53ed 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c | |||
@@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev) | |||
2551 | 2551 | ||
2552 | /* get charger specific platform data */ | 2552 | /* get charger specific platform data */ |
2553 | plat_data = pdev->dev.platform_data; | 2553 | plat_data = pdev->dev.platform_data; |
2554 | di->pdata = plat_data->charger; | 2554 | if (!plat_data || !plat_data->charger) { |
2555 | |||
2556 | if (!di->pdata) { | ||
2557 | dev_err(di->dev, "no charger platform data supplied\n"); | 2555 | dev_err(di->dev, "no charger platform data supplied\n"); |
2558 | ret = -EINVAL; | 2556 | ret = -EINVAL; |
2559 | goto free_device_info; | 2557 | goto free_device_info; |
2560 | } | 2558 | } |
2559 | di->pdata = plat_data->charger; | ||
2561 | 2560 | ||
2562 | /* get battery specific platform data */ | 2561 | /* get battery specific platform data */ |
2563 | di->bat = plat_data->battery; | 2562 | di->bat = plat_data->battery; |