aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@nokia.com>2010-11-04 10:31:48 -0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-11-18 08:56:20 -0500
commita4607d9f5cbae1aad7f86e8204b57d66c0e14e36 (patch)
treeade06599b0c57548667452558c51b1b5ed81abbb /drivers
parentbac43b20501058ab0728246acce3bb85f2e72648 (diff)
isp1704_charger: Set isp->dev before anything needs it
isp1704_test_ulpi() is the first place that needs isp->dev member, so it must be set before calling the function. Signed-off-by: Heikki Krogerus <heikki.krogerus@nokia.com> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/isp1704_charger.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 10c7cc5fb5f9..77c11f1d72e2 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -391,13 +391,13 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
391 if (!isp->otg) 391 if (!isp->otg)
392 goto fail0; 392 goto fail0;
393 393
394 isp->dev = &pdev->dev;
395 platform_set_drvdata(pdev, isp);
396
394 ret = isp1704_test_ulpi(isp); 397 ret = isp1704_test_ulpi(isp);
395 if (ret < 0) 398 if (ret < 0)
396 goto fail1; 399 goto fail1;
397 400
398 isp->dev = &pdev->dev;
399 platform_set_drvdata(pdev, isp);
400
401 isp->psy.name = "isp1704"; 401 isp->psy.name = "isp1704";
402 isp->psy.type = POWER_SUPPLY_TYPE_USB; 402 isp->psy.type = POWER_SUPPLY_TYPE_USB;
403 isp->psy.properties = power_props; 403 isp->psy.properties = power_props;