Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

leds: 88pm860x - fix checking in probe function

Browse source 
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>
This commit is contained in:
Christoph Fritz 2010-04-17 13:57:17 +02:00 committed by Richard Purdie
parent b1cdc4670b
commit 98652efcea
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/leds/leds-88pm860x.c
View file

@ -256,8 +256,10 @@ static int pm860x_led_probe(struct platform_device *pdev)
if (pdev->dev.parent->platform_data) { if (pdev->dev.parent->platform_data) {
pm860x_pdata = pdev->dev.parent->platform_data; pm860x_pdata = pdev->dev.parent->platform_data;
pdata = pm860x_pdata->led; pdata = pm860x_pdata->led;
} else } else {
pdata = NULL; dev_err(&pdev->dev, "missing platform data\n");
return -EINVAL;
}
data = kzalloc(sizeof(struct pm860x_led), GFP_KERNEL); data = kzalloc(sizeof(struct pm860x_led), GFP_KERNEL);
if (data == NULL) 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->i2c = (chip->id == CHIP_PM8606) ? chip->client : chip->companion;
data->iset = pdata->iset; data->iset = pdata->iset;
data->port = __check_device(pdata, data->name); 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; return -EINVAL;
}
data->current_brightness = 0; data->current_brightness = 0;
data->cdev.name = data->name; data->cdev.name = data->name;