diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:31:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:31:45 +1000 |
| commit | 6d8e85596bfbc416d9e49034d2258219039afb3c (patch) | |
| tree | 0f776b01d433e19679eb5bbc7c62202dde759f62 /drivers | |
| parent | 36ef7d9f87a999dbe5e7526b6b9554bdcbb1ff75 (diff) | |
| parent | 34f3b3aa6713dede7dc894d7cbfdc281c67c1df0 (diff) | |
Merge commit 'refs/next/20100526/leds'
Diffstat (limited to 'drivers')
| -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; |