]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:16:01 +0000 (14:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:16:01 +0000 (14:16 +1000)
1  2 
drivers/regulator/scmi-regulator.c

index a38343f8c843a9d91c1525fdc4cc3a559ecbc0fc,a917c81e99fac323a4853e3127539daa184df7a8..bbadf72b94e8c19b28b449465094f40d7b875fbc
@@@ -345,10 -341,12 +345,12 @@@ static int scmi_regulator_probe(struct 
         */
        np = of_find_node_by_name(handle->dev->of_node, "regulators");
        for_each_child_of_node(np, child) {
 -              ret = process_scmi_regulator_of_node(sdev, child, rinfo);
 +              ret = process_scmi_regulator_of_node(sdev, ph, child, rinfo);
                /* abort on any mem issue */
-               if (ret == -ENOMEM)
+               if (ret == -ENOMEM) {
+                       of_node_put(child);
                        return ret;
+               }
        }
  
        /*