diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-08-31 14:08:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-31 14:08:26 +0200 |
| commit | 83b033bd33a8b7b16f568e3432d3e27d03ef9c82 (patch) | |
| tree | f73c40848c80363b41591ee8511f94b466f69cf8 /sound/soc/codecs | |
| parent | bcab3a6e64a9647e022b46182c9687a8c3aa9d11 (diff) | |
| parent | 05997302b7aa56a7f4a7b9d49d0661865c17874d (diff) | |
| download | lwn-83b033bd33a8b7b16f568e3432d3e27d03ef9c82.tar.gz lwn-83b033bd33a8b7b16f568e3432d3e27d03ef9c82.zip | |
Merge tag 'asoc-fix-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.13
A couple of fixes, one for a regression in simple-card introduced during
the merge window that was only reported this week and another for a
regression in registration of ACPI GPIOs.
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/rt5670.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index 0ec7985ed306..054b613cb0d0 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -567,7 +567,7 @@ int rt5670_set_jack_detect(struct snd_soc_codec *codec, rt5670->jack = jack; rt5670->hp_gpio.gpiod_dev = codec->dev; - rt5670->hp_gpio.name = "headphone detect"; + rt5670->hp_gpio.name = "headset"; rt5670->hp_gpio.report = SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2; rt5670->hp_gpio.debounce_time = 150; |