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

Commit 22d881c0 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Avoid potential NULL dereference in reg_fixed_voltage_probe() 



of_get_fixed_voltage_config() may return NULL, return -ENOMEM in this case
so we don't dereference NULL pointer.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bc91396b

drivers/regulator/fixed.c

+6 −1
Original line number Diff line number Diff line
@@ -160,12 +160,17 @@ static struct regulator_ops fixed_voltage_ops = { 


static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)

{

	struct fixed_voltage_config *config = pdev->dev.platform_data;

	struct fixed_voltage_config *config;

	struct fixed_voltage_data *drvdata;

	int ret;



	if (pdev->dev.of_node)

		config = of_get_fixed_voltage_config(&pdev->dev);

	else

		config = pdev->dev.platform_data;



	if (!config)

		return -ENOMEM;



	drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);

	if (drvdata == NULL) {