lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 285/371] ASoC: core: Adapt for debugfs API change
    Date
    From: Mark Brown <broonie@kernel.org>

    commit c2c928c93173f220955030e8440517b87ec7df92 upstream.

    Back in ff9fb72bc07705c (debugfs: return error values, not NULL) the
    debugfs APIs were changed to return error pointers rather than NULL
    pointers on error, breaking the error checking in ASoC. Update the
    code to use IS_ERR() and log the codes that are returned as part of
    the error messages.

    Fixes: ff9fb72bc07705c (debugfs: return error values, not NULL)
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Cc: stable@vger.kernel.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/soc-core.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -158,9 +158,10 @@ static void soc_init_component_debugfs(s
    component->card->debugfs_card_root);
    }

    - if (!component->debugfs_root) {
    + if (IS_ERR(component->debugfs_root)) {
    dev_warn(component->dev,
    - "ASoC: Failed to create component debugfs directory\n");
    + "ASoC: Failed to create component debugfs directory: %ld\n",
    + PTR_ERR(component->debugfs_root));
    return;
    }

    @@ -212,18 +213,21 @@ static void soc_init_card_debugfs(struct

    card->debugfs_card_root = debugfs_create_dir(card->name,
    snd_soc_debugfs_root);
    - if (!card->debugfs_card_root) {
    + if (IS_ERR(card->debugfs_card_root)) {
    dev_warn(card->dev,
    - "ASoC: Failed to create card debugfs directory\n");
    + "ASoC: Failed to create card debugfs directory: %ld\n",
    + PTR_ERR(card->debugfs_card_root));
    + card->debugfs_card_root = NULL;
    return;
    }

    card->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
    card->debugfs_card_root,
    &card->pop_time);
    - if (!card->debugfs_pop_time)
    + if (IS_ERR(card->debugfs_pop_time))
    dev_warn(card->dev,
    - "ASoC: Failed to create pop time debugfs file\n");
    + "ASoC: Failed to create pop time debugfs file: %ld\n",
    + PTR_ERR(card->debugfs_pop_time));
    }

    static void soc_cleanup_card_debugfs(struct snd_soc_card *card)

    \
     
     \ /
      Last update: 2019-07-24 22:13    [W:2.536 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site