Merge remote-tracking branch 'regulator/fix/tps65910' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Feb 2013 11:28:53 +0000 (11:28 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Feb 2013 11:28:53 +0000 (11:28 +0000)
drivers/regulator/tps65910-regulator.c

index 59c3770fa77dbe5b77ae1b3c96c1e105cae8f58e..b0e4c0bc85c319c9265e12ab193a0aec86156a64 100644 (file)
@@ -998,7 +998,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
                return NULL;
        }
 
-       ret = of_regulator_match(pdev->dev.parent, regulators, matches, count);
+       ret = of_regulator_match(&pdev->dev, regulators, matches, count);
        if (ret < 0) {
                dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
                        ret);