Merge branch 'pdc-regression' into release

[~andy/linux] / drivers / leds / leds-88pm860x.c

diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index 16a60c06c96c62c7bd6eb4d87fac77d46af1b66a..b7677106cff8041035be46fdc03442acd727f0cb 100644 (file)
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -256,8 +256,10 @@ static int pm860x_led_probe(struct platform_device *pdev)
        if (pdev->dev.parent->platform_data) {
                pm860x_pdata = pdev->dev.parent->platform_data;
                pdata = pm860x_pdata->led;
-       } else
-               pdata = NULL;
+       } else {
+               dev_err(&pdev->dev, "missing platform data\n");
+               return -EINVAL;
+       }
 
        data = kzalloc(sizeof(struct pm860x_led), GFP_KERNEL);
        if (data == NULL)
@@ -268,8 +270,11 @@ static int pm860x_led_probe(struct platform_device *pdev)
        data->i2c = (chip->id == CHIP_PM8606) ? chip->client : chip->companion;
        data->iset = pdata->iset;
        data->port = __check_device(pdata, data->name);
-       if (data->port < 0)
+       if (data->port < 0) {
+               dev_err(&pdev->dev, "check device failed\n");
+               kfree(data);
                return -EINVAL;
+       }
 
        data->current_brightness = 0;
        data->cdev.name = data->name;