From 7f40bc1c01d2a439d0421db3450953ac0076adc4 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Sun, 28 Oct 2012 21:31:07 -0700 Subject: [PATCH] --- yaml --- r: 344469 b: refs/heads/master c: 3651c4b904b005fcba757c529184e8c3c596cb05 h: refs/heads/master i: 344467: a3b97de37504944fccebad994d45342024c1bdfd v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-88pm860x.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 66d0b1c0f274..29027b05ebb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b21ec5a2852ffd8db4189d4ef1c221aabc64936 +refs/heads/master: 3651c4b904b005fcba757c529184e8c3c596cb05 diff --git a/trunk/drivers/leds/leds-88pm860x.c b/trunk/drivers/leds/leds-88pm860x.c index b7e8cc0957fc..6be2edd41173 100644 --- a/trunk/drivers/leds/leds-88pm860x.c +++ b/trunk/drivers/leds/leds-88pm860x.c @@ -165,15 +165,13 @@ static int pm860x_led_probe(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_REG, "control"); if (!res) { dev_err(&pdev->dev, "No REG resource for control\n"); - ret = -ENXIO; - goto out; + return -ENXIO; } data->reg_control = res->start; res = platform_get_resource_byname(pdev, IORESOURCE_REG, "blink"); if (!res) { dev_err(&pdev->dev, "No REG resource for blink\n"); - ret = -ENXIO; - goto out; + return -ENXIO; } data->reg_blink = res->start; memset(data->name, 0, MFD_NAME_SIZE); @@ -224,9 +222,6 @@ static int pm860x_led_probe(struct platform_device *pdev) } pm860x_led_set(&data->cdev, 0); return 0; -out: - devm_kfree(&pdev->dev, data); - return ret; } static int pm860x_led_remove(struct platform_device *pdev)