]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: rt5677: Fix initialization of rt5677_of_match.data
authorMatthias Kaehlcke <mka@chromium.org>
Tue, 7 Aug 2018 17:19:40 +0000 (10:19 -0700)
committerMark Brown <broonie@kernel.org>
Wed, 8 Aug 2018 09:52:25 +0000 (10:52 +0100)
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>
sound/soc/codecs/rt5677.c

index 922becfee59be04dfa39acb38bdd41cc07a2fb26..9b7a1833d3316c28d2872294e629664c6e59e4f2 100644 (file)
@@ -5008,7 +5008,7 @@ static const struct regmap_config rt5677_regmap = {
 };
 
 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);