From 8da560b206dbc45c8acff9c35892ca7e5e189b19 Mon Sep 17 00:00:00 2001 From: Yadwinder Singh Brar Date: Fri, 6 Jul 2012 14:50:08 +0530 Subject: [PATCH] --- yaml --- r: 312618 b: refs/heads/master c: d1ef065d43476fd0e245cad2ef1d226e7cb6324b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max77686.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c554deb0fbda..df9db5daa3af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19228a6a59250d414824ae07e06ad057a404ea3e +refs/heads/master: d1ef065d43476fd0e245cad2ef1d226e7cb6324b diff --git a/trunk/drivers/regulator/max77686.c b/trunk/drivers/regulator/max77686.c index fc695eb3886e..c564af6f05a3 100644 --- a/trunk/drivers/regulator/max77686.c +++ b/trunk/drivers/regulator/max77686.c @@ -262,6 +262,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev, for (i = 0; i < pdata->num_regulators; i++) { rmatch.name = regulators[i].name; rmatch.init_data = NULL; + rmatch.of_node = NULL; of_regulator_match(iodev->dev, regulators_np, &rmatch, 1); rdata[i].initdata = rmatch.init_data; }