regulator: Fix regulator_summary for deviceless consumers
authorLeonard Crestez <leonard.crestez@nxp.com>
Tue, 14 Feb 2017 15:31:03 +0000 (17:31 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 16 Feb 2017 12:44:58 +0000 (12:44 +0000)
It is allowed to call regulator_get with a NULL dev argument
(_regulator_get explicitly checks for it) but this causes an error later
when printing /sys/kernel/debug/regulator_summary.

Fix this by explicitly handling "deviceless" consumers in the debugfs code.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
drivers/regulator/core.c

index 04baac9a165bbb56da292a51d0a56055947861e0..66319542baa6eef8c6610900d5cdf8712a7dfeb8 100644 (file)
@@ -4391,12 +4391,13 @@ static void regulator_summary_show_subtree(struct seq_file *s,
        seq_puts(s, "\n");
 
        list_for_each_entry(consumer, &rdev->consumer_list, list) {
-               if (consumer->dev->class == &regulator_class)
+               if (consumer->dev && consumer->dev->class == &regulator_class)
                        continue;
 
                seq_printf(s, "%*s%-*s ",
                           (level + 1) * 3 + 1, "",
-                          30 - (level + 1) * 3, dev_name(consumer->dev));
+                          30 - (level + 1) * 3,
+                          consumer->dev ? dev_name(consumer->dev) : "deviceless");
 
                switch (rdev->desc->type) {
                case REGULATOR_VOLTAGE: