Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98652efc authored by Christoph Fritz's avatar Christoph Fritz Committed by Richard Purdie
Browse files

leds: 88pm860x - fix checking in probe function 



Improve device and platform data checks in probe function.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarChristoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: default avatarRichard Purdie <rpurdie@linux.intel.com>
parent b1cdc467

drivers/leds/leds-88pm860x.c

+8 −3
Original line number Diff line number Diff line
@@ -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;