lkml.org 
[lkml]   [2018]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 114/197] ASoC: rt5677: Fix initialization of rt5677_of_match.data
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Matthias Kaehlcke <mka@chromium.org>

    [ Upstream commit f861e3e28a3016a2064d9f600eaa92a530b732b4 ]

    The driver expects to find the device id in rt5677_of_match.data, however
    it is currently assigned to rt5677_of_match.type. Fix this.

    The problem was found with the help of clang:
    sound/soc/codecs/rt5677.c:5010:36: warning: expression which evaluates to
    zero treated as a null pointer constant of type 'const void *'
    [-Wnon-literal-null-conversion]
    { .compatible = "realtek,rt5677", RT5677 },
    ^~~~~~

    Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")
    Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
    Reviewed-by: Guenter Roeck <groeck@chromium.org>
    Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/codecs/rt5677.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/sound/soc/codecs/rt5677.c
    +++ b/sound/soc/codecs/rt5677.c
    @@ -5007,7 +5007,7 @@ static const struct regmap_config rt5677
    };

    static const struct of_device_id rt5677_of_match[] = {
    - { .compatible = "realtek,rt5677", RT5677 },
    + { .compatible = "realtek,rt5677", .data = (const void *)RT5677 },
    { }
    };
    MODULE_DEVICE_TABLE(of, rt5677_of_match);

    \
     
     \ /
      Last update: 2018-09-13 16:03    [W:2.525 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site