1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index feac7b066e6c..a7984af1dc66 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -849,6 +849,9 @@ __power_supply_register(struct device *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);
+
         psy = kzalloc(sizeof(*psy), GFP_KERNEL);
         if (!psy)
                 return ERR_PTR(-ENOMEM);