diff options
| author | Greg Kroah-Hartman | 2016-11-14 08:11:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-11-14 08:11:29 +0100 |
| commit | 8a0a8e1c42fdf656e7b729e9c468c2caa687adb7 (patch) | |
| tree | bde58e16dd5e6912deccac7e41b9a95f05187ea6 /sound/soc/codecs/cs4270.c | |
| parent | USB: cdc-acm: use get_icount tty operation (diff) | |
| parent | Linux 4.9-rc5 (diff) | |
| download | kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.gz kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.xz kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.zip | |
Merge 4.9-rc5 into usb-next
We want/need the USB fixes in here as well, for testing and merge
issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/codecs/cs4270.c')
| -rw-r--r-- | sound/soc/codecs/cs4270.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 18baea2f7d65..84f86745c30e 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -148,11 +148,11 @@ SND_SOC_DAPM_OUTPUT("AOUTR"), }; static const struct snd_soc_dapm_route cs4270_dapm_routes[] = { - { "Capture", NULL, "AINA" }, - { "Capture", NULL, "AINB" }, + { "Capture", NULL, "AINL" }, + { "Capture", NULL, "AINR" }, - { "AOUTA", NULL, "Playback" }, - { "AOUTB", NULL, "Playback" }, + { "AOUTL", NULL, "Playback" }, + { "AOUTR", NULL, "Playback" }, }; /** |