Merge back thermal control material for 6.4-rc1.

[platform/kernel/linux-starfive.git] / drivers / power / supply / power_supply_core.c

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index ecb5718..5bf3502 100644 (file)
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1207,13 +1207,13 @@ __power_supply_register(struct device *parent,
        struct power_supply *psy;
        int rc;
 
+       if (!desc || !desc->name || !desc->properties || !desc->num_properties)
+               return ERR_PTR(-EINVAL);
+
        if (!parent)
                pr_warn("%s: Expected proper parent device for '%s'\n",
                        __func__, desc->name);
 
-       if (!desc || !desc->name || !desc->properties || !desc->num_properties)
-               return ERR_PTR(-EINVAL);
-
        if (psy_has_property(desc, POWER_SUPPLY_PROP_USB_TYPE) &&
            (!desc->usb_types || !desc->num_usb_types))
                return ERR_PTR(-EINVAL);