aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-lp8788.c
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2013-01-02 22:28:12 -0800
committerBryan Wu <cooloney@gmail.com>2013-02-01 17:47:05 -0800
commita1932edf8baaf2b09ad72b119c1f9749ad4397f2 (patch)
tree486cb7da402679943d8b85b48c86c3797fe7035f /drivers/leds/leds-lp8788.c
parentleds: leds-pwm: Add device tree bindings (diff)
downloadlinux-dev-a1932edf8baaf2b09ad72b119c1f9749ad4397f2.tar.xz
linux-dev-a1932edf8baaf2b09ad72b119c1f9749ad4397f2.zip
leds-lp8788: fix a parent device in _probe()
The lp8788-keyled 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, registering led device and device kernel messages. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/leds-lp8788.c')
-rw-r--r--drivers/leds/leds-lp8788.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/leds/leds-lp8788.c b/drivers/leds/leds-lp8788.c
index 4353942c5fd1..7c2cb384e7ae 100644
--- a/drivers/leds/leds-lp8788.c
+++ b/drivers/leds/leds-lp8788.c
@@ -130,9 +130,10 @@ static int lp8788_led_probe(struct platform_device *pdev)
struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
struct lp8788_led_platform_data *led_pdata;
struct lp8788_led *led;
+ struct device *dev = &pdev->dev;
int ret;
- led = devm_kzalloc(lp->dev, sizeof(struct lp8788_led), GFP_KERNEL);
+ led = devm_kzalloc(dev, sizeof(struct lp8788_led), GFP_KERNEL);
if (!led)
return -ENOMEM;
@@ -154,13 +155,13 @@ static int lp8788_led_probe(struct platform_device *pdev)
ret = lp8788_led_init_device(led, led_pdata);
if (ret) {
- dev_err(lp->dev, "led init device err: %d\n", ret);
+ dev_err(dev, "led init device err: %d\n", ret);
return ret;
}
- ret = led_classdev_register(lp->dev, &led->led_dev);
+ ret = led_classdev_register(dev, &led->led_dev);
if (ret) {
- dev_err(lp->dev, "led register err: %d\n", ret);
+ dev_err(dev, "led register err: %d\n", ret);
return ret;
}