diff options
| author | Christoph Fritz <chf.fritz@googlemail.com> | 2010-04-17 13:57:17 +0200 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-26 13:07:54 +0100 |
| commit | 98652efceab8f0b1a3a1b2750544a395ec056115 (patch) | |
| tree | 9d2cbdcef2edaa14691ad07881611320ceaeb309 /drivers/leds | |
| parent | b1cdc4670b9508fcd47a15fbd12f70d269880b37 (diff) | |
| download | linux-98652efceab8f0b1a3a1b2750544a395ec056115.tar.gz linux-98652efceab8f0b1a3a1b2750544a395ec056115.tar.bz2 linux-98652efceab8f0b1a3a1b2750544a395ec056115.zip | |
leds: 88pm860x - fix checking in probe function
Improve device and platform data checks in probe function.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-88pm860x.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c index 16a60c06c96c..b7677106cff8 100644 --- 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; |