diff options
author | Mark Brown <broonie@kernel.org> | 2022-11-24 16:19:02 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2022-11-24 16:19:02 +0300 |
commit | 81cb291eaf56a2b4aebd2aeb4070d6f049da4343 (patch) | |
tree | 8c003f185ed7b344beae0ee6321a648b77fee2b1 /sound/soc/codecs | |
parent | db8f91d424fe0ea6db337aca8bc05908bbce1498 (diff) | |
parent | 19c5bda74dc45fee598a57600b550c9ea7662f10 (diff) | |
download | linux-81cb291eaf56a2b4aebd2aeb4070d6f049da4343.tar.xz |
ASoC: Merge dropped fixes from v5.18
These fixes were queued for v5.18 but due to me changing my scripting
they never actually got merged - pulling them up now.
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/tlv320adc3xxx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320adc3xxx.c b/sound/soc/codecs/tlv320adc3xxx.c index a969547708d4..52bb55724724 100644 --- a/sound/soc/codecs/tlv320adc3xxx.c +++ b/sound/soc/codecs/tlv320adc3xxx.c @@ -14,6 +14,7 @@ #include <dt-bindings/sound/tlv320adc3xxx.h> #include <linux/clk.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/io.h> @@ -1025,7 +1026,9 @@ static const struct gpio_chip adc3xxx_gpio_chip = { static void adc3xxx_free_gpio(struct adc3xxx *adc3xxx) { +#ifdef CONFIG_GPIOLIB gpiochip_remove(&adc3xxx->gpio_chip); +#endif } static void adc3xxx_init_gpio(struct adc3xxx *adc3xxx) |