lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 037/153] regulator: Fix regulator_summary for deviceless consumers
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Leonard Crestez <leonard.crestez@nxp.com>

    commit e42a46b6f52473661ad192f76a128a68fe301df4 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/regulator/core.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/regulator/core.c
    +++ b/drivers/regulator/core.c
    @@ -4357,12 +4357,13 @@ static void regulator_summary_show_subtr
    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:

    \
     
     \ /
      Last update: 2017-03-10 12:31    [W:2.536 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site