Commit dfb85ba1 authored Apr 07, 2015 by Colin Ian King Committed by Mark Brown Apr 08, 2015

regulator: max8660: fix assignment of pdata to data that becomes dead



pdata is assigned to &pdata_of, however, pdata_of becomes dead (when it
goes out of scope) so pdata effectively becomes a dead pointer to the
out of scope object.  This is detected by static analysis:

[drivers/regulator/max8660.c:411]: (error) Dead pointer usage.
  Pointer 'pdata' is dead if it has been assigned '&pdata_of' at line 404.

Move declaration of pdata_of so it is always in scope.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent c517d838

drivers/regulator/max8660.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@ static int max8660_probe(struct i2c_client *client,
		const struct i2c_device_id *i2c_id)
		{
		struct device *dev = &client->dev;
		struct max8660_platform_data *pdata = dev_get_platdata(dev);
		struct max8660_platform_data pdata_of, *pdata = dev_get_platdata(dev);
		struct regulator_config config = { };
		struct max8660 *max8660;
		int boot_on, i, id, ret = -EINVAL;
		@@ -391,7 +391,6 @@ static int max8660_probe(struct i2c_client *client,

		if (dev->of_node && !pdata) {
		const struct of_device_id *id;
		struct max8660_platform_data pdata_of;

		id = of_match_device(of_match_ptr(max8660_dt_ids), dev);
		if (!id)