From: Mark Brown <broonie@kernel.org>
Date: Wed, 4 May 2022 14:30:32 +0000 (+0100)
Subject: ASoC: Pull in fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c0b38be14f1d843c29edc763d3df3cc741a2bf10;p=linux.git

ASoC: Pull in fixes

Cleanups for the dmaengine code build on top of current fixes.
---

c0b38be14f1d843c29edc763d3df3cc741a2bf10
diff --cc sound/soc/codecs/wm8960.c
index 92fcd335c5de9,08c87ac161373..8c8f32b230838
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@@ -1506,9 -1519,10 +1518,10 @@@ MODULE_DEVICE_TABLE(acpi, wm8960_acpi_m
  static struct i2c_driver wm8960_i2c_driver = {
  	.driver = {
  		.name = "wm8960",
- 		.of_match_table = wm8960_of_match,
+ 		.of_match_table = of_match_ptr(wm8960_of_match),
+ 		.acpi_match_table = ACPI_PTR(wm8960_acpi_match),
  	},
 -	.probe =    wm8960_i2c_probe,
 +	.probe_new = wm8960_i2c_probe,
  	.remove =   wm8960_i2c_remove,
  	.id_table = wm8960_i2c_id,
  };