userns: Check euid no fsuid when establishing an unprivileged uid mapping

[deliverable/linux.git] / drivers / power / max8925_power.c

diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index b4513f284bbc48385b7de527b16364921a2195e7..a6d45eef64dda574a6ab1b6db41af43c9e748e4c 100644 (file)
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -443,7 +443,7 @@ max8925_power_dt_init(struct platform_device *pdev)
        if (!nproot)
                return pdev->dev.platform_data;
 
-       np = of_find_node_by_name(nproot, "charger");
+       np = of_get_child_by_name(nproot, "charger");
        if (!np) {
                dev_err(&pdev->dev, "failed to find charger node\n");
                return NULL;
@@ -452,13 +452,14 @@ max8925_power_dt_init(struct platform_device *pdev)
        pdata = devm_kzalloc(&pdev->dev,
                        sizeof(struct max8925_power_pdata),
                        GFP_KERNEL);
+       if (!pdata)
+               goto ret;
 
        of_property_read_u32(np, "topoff-threshold", &topoff_threshold);
        of_property_read_u32(np, "batt-detect", &batt_detect);
        of_property_read_u32(np, "fast-charge", &fast_charge);
        of_property_read_u32(np, "no-insert-detect", &no_insert_detect);
        of_property_read_u32(np, "no-temp-support", &no_temp_support);
-       of_node_put(np);
 
        pdata->batt_detect = batt_detect;
        pdata->fast_charge = fast_charge;
@@ -466,6 +467,8 @@ max8925_power_dt_init(struct platform_device *pdev)
        pdata->no_insert_detect = no_insert_detect;
        pdata->no_temp_support = no_temp_support;
 
+ret:
+       of_node_put(np);
        return pdata;
 }
 #else