Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 19 Feb 2013 12:43:07 +0000 (12:43 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 19 Feb 2013 12:43:07 +0000 (12:43 +0000)
1  2 
drivers/regulator/palmas-regulator.c

index cbaf22627bd35dbaeaa60bbb1e093cd380b2d63c,22c6ae27d0087450624daa5ce8f5762093518ff3..cde13bb5a8fbc4163eb7769b9b7e09e90eaf1d75
@@@ -527,7 -527,6 +527,7 @@@ static void palmas_dt_to_pdata(struct d
        u32 prop;
        int idx, ret;
  
 +      node = of_node_get(node);
        regulators = of_find_node_by_name(node, "regulators");
        if (!regulators) {
                dev_info(dev, "regulator node not found\n");
  
        ret = of_regulator_match(dev, regulators, palmas_matches,
                        PALMAS_NUM_REGS);
 +      of_node_put(regulators);
        if (ret < 0) {
                dev_err(dev, "Error parsing regulator init data: %d\n", ret);
                return;
                if (!ret)
                        pdata->reg_init[idx]->mode_sleep = prop;
  
-               ret = of_property_read_u32(palmas_matches[idx].of_node,
-                               "ti,warm_reset", &prop);
-               if (!ret)
-                       pdata->reg_init[idx]->warm_reset = prop;
                ret = of_property_read_u32(palmas_matches[idx].of_node,
                                "ti,tstep", &prop);
                if (!ret)