diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-25 13:54:58 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-25 13:54:57 -0700 |
commit | ba53c4518c7bf3b3abda54284cfb2a6d2175749b (patch) | |
tree | 9f56beb17efa19aafebb40d245d5c159bf4c4b12 /drivers/regulator | |
parent | 63e553c0c5ad690fb0f4e9990dd77f93441b3afc (diff) | |
parent | a4b9c109c2f9143790c1d1a96475eecf7338713a (diff) |
Merge "Merge tag v4.4.55 into branch 'msm-4.4'"
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 88a5c497d5ed..4f9de7fda612 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4705,12 +4705,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 == ®ulator_class) + if (consumer->dev && consumer->dev->class == ®ulator_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: |