diff options
| author | Kim, Milo <Milo.Kim@ti.com> | 2013-01-03 06:30:16 +0000 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-01-06 14:18:19 -0800 |
| commit | 05ac539b4fb4f7d7d0f3123c5bb81a4b34aa5327 (patch) | |
| tree | c26fe0f66d07683b105dd30a5920688a5897ce5c /drivers/power | |
| parent | ffd8f9a727f27270584c7472ca56cce1e4736888 (diff) | |
| download | linux-05ac539b4fb4f7d7d0f3123c5bb81a4b34aa5327.tar.gz | |
lp8788-charger: Fix a parent device in _probe()
The lp8788-charger is a platform driver of lp8788-mfd. The platform device is allocated when mfd_add_devices() is called in lp8788-mfd. On the other hand, 'lp->dev' is the i2c client device. Therefore, this 'platform_device' is a proper parent device in case of resource managed mem alloc and device kernel message. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/lp8788-charger.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c index 22b6407c9ca9..126a83a56640 100644 --- a/drivers/power/lp8788-charger.c +++ b/drivers/power/lp8788-charger.c @@ -690,9 +690,10 @@ static int lp8788_charger_probe(struct platform_device *pdev) { struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent); struct lp8788_charger *pchg; + struct device *dev = &pdev->dev; int ret; - pchg = devm_kzalloc(lp->dev, sizeof(struct lp8788_charger), GFP_KERNEL); + pchg = devm_kzalloc(dev, sizeof(struct lp8788_charger), GFP_KERNEL); if (!pchg) return -ENOMEM; @@ -718,7 +719,7 @@ static int lp8788_charger_probe(struct platform_device *pdev) ret = lp8788_irq_register(pdev, pchg); if (ret) - dev_warn(lp->dev, "failed to register charger irq: %d\n", ret); + dev_warn(dev, "failed to register charger irq: %d\n", ret); return 0; } |