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

Commit 804486b1 authored by Milo Kim's avatar Milo Kim Committed by Mark Brown
Browse files

regulator: lp872x: handle error case 



If memory allocation gets failed on parsing the DT, then it returns error
'-ENOMEM' explicitly. Then, the driver exists from the _probe().

Signed-off-by: default avatarMilo Kim <milo.kim@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d9ffae15

drivers/regulator/lp872x.c

+7 −4
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static struct lp872x_platform_data 


	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		goto out;

		return ERR_PTR(-ENOMEM);



	of_property_read_u8(np, "ti,general-config", &pdata->general_config);

	if (of_find_property(np, "ti,update-config", NULL))
@@ -857,7 +857,7 @@ static struct lp872x_platform_data 


	pdata->dvs = devm_kzalloc(dev, sizeof(struct lp872x_dvs), GFP_KERNEL);

	if (!pdata->dvs)

		goto out;

		return ERR_PTR(-ENOMEM);



	pdata->dvs->gpio = of_get_named_gpio(np, "ti,dvs-gpio", 0);

	of_property_read_u8(np, "ti,dvs-vsel", (u8 *)&pdata->dvs->vsel);
@@ -910,11 +910,14 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) 
		[LP8725] = LP8725_NUM_REGULATORS,

	};



	if (cl->dev.of_node)

	if (cl->dev.of_node) {

		pdata = lp872x_populate_pdata_from_dt(&cl->dev,

					      (enum lp872x_id)id->driver_data);

	else

		if (IS_ERR(pdata))

			return PTR_ERR(pdata);

	} else {

		pdata = dev_get_platdata(&cl->dev);

	}



	lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);

	if (!lp)