Skip to content

Commit

Permalink
regulator: Avoid potential NULL dereference in reg_fixed_voltage_probe()
Browse files Browse the repository at this point in the history
of_get_fixed_voltage_config() may return NULL, return -ENOMEM in this case
so we don't dereference NULL pointer.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Nov 27, 2011
1 parent bc91396 commit 22d881c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/regulator/fixed.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 22d881c

Please sign in to comment.