From 6229b1296ee6e034d956a8b52986a841acc89c12 Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Thu, 3 Jan 2013 06:30:16 +0000 Subject: [PATCH] --- yaml --- r: 350606 b: refs/heads/master c: 05ac539b4fb4f7d7d0f3123c5bb81a4b34aa5327 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/lp8788-charger.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bccaa59a34d7..a273ad4f3233 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffd8f9a727f27270584c7472ca56cce1e4736888 +refs/heads/master: 05ac539b4fb4f7d7d0f3123c5bb81a4b34aa5327 diff --git a/trunk/drivers/power/lp8788-charger.c b/trunk/drivers/power/lp8788-charger.c index 22b6407c9ca9..126a83a56640 100644 --- a/trunk/drivers/power/lp8788-charger.c +++ b/trunk/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; }