From bf8a0fc98a69e82b44dd883e44d70a9352ab873a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 27 Jan 2013 20:54:40 +0800 Subject: [PATCH] --- yaml --- r: 350467 b: refs/heads/master c: 0ce7d00d0d7bc04d917b8775da177dde962ce17e h: refs/heads/master i: 350465: 0ef74e3c8716c7b0c28db95a87d4dcee1e71871e 350463: 4986de250fc6d54be9a8c3efb37fd9bb5c5e4b52 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps6507x-regulator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 64fd5264c962..cd8d20670c94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6116ad94e1205b33a4c96530474844cd2a1ac21d +refs/heads/master: 0ce7d00d0d7bc04d917b8775da177dde962ce17e diff --git a/trunk/drivers/regulator/tps6507x-regulator.c b/trunk/drivers/regulator/tps6507x-regulator.c index afdeb65b6a4d..54aa2da7283b 100644 --- a/trunk/drivers/regulator/tps6507x-regulator.c +++ b/trunk/drivers/regulator/tps6507x-regulator.c @@ -394,7 +394,7 @@ static struct tps6507x_board *tps6507x_parse_dt_reg_data( count = ARRAY_SIZE(tps6507x_matches); matches = tps6507x_matches; - 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);