From 0b8e85af1eaa070e3faba9227e7b7b8edf3ef7f5 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 17 Dec 2012 16:00:57 -0800 Subject: [PATCH] --- yaml --- r: 346391 b: refs/heads/master c: 3a1f9462dbdf4d671f2f21290d507d1ae89d141a h: refs/heads/master i: 346389: 28fccc83f3a11576645051670dc1244bc80d12c5 346387: 2dad4b027e3b48f2a52faf308631f4de6fc32aa7 346383: 75a14e02421706bad27253218bbafffd40a6884c v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/88pm860x_bl.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index e880f6f8cac6..191e03267a17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c48d1f2539cf3a42adc5fe4f77950eeb28bef3b +refs/heads/master: 3a1f9462dbdf4d671f2f21290d507d1ae89d141a diff --git a/trunk/drivers/video/backlight/88pm860x_bl.c b/trunk/drivers/video/backlight/88pm860x_bl.c index 6e509d995093..bb21412547a9 100644 --- a/trunk/drivers/video/backlight/88pm860x_bl.c +++ b/trunk/drivers/video/backlight/88pm860x_bl.c @@ -208,22 +208,19 @@ static int pm860x_backlight_probe(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_REG, "duty cycle"); if (!res) { dev_err(&pdev->dev, "No REG resource for duty cycle\n"); - ret = -ENXIO; - goto out; + return -ENXIO; } data->reg_duty_cycle = res->start; res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on"); if (!res) { dev_err(&pdev->dev, "No REG resorce for always on\n"); - ret = -ENXIO; - goto out; + return -ENXIO; } data->reg_always_on = res->start; res = platform_get_resource_byname(pdev, IORESOURCE_REG, "current"); if (!res) { dev_err(&pdev->dev, "No REG resource for current\n"); - ret = -ENXIO; - goto out; + return -ENXIO; } data->reg_current = res->start; @@ -263,8 +260,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev) return 0; out_brt: backlight_device_unregister(bl); -out: - devm_kfree(&pdev->dev, data); return ret; }