From 878b011b9bdb76077baefb5425e60f261712f37d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 8 Apr 2014 18:49:00 +0200 Subject: Revert "ALSA: hda - Increment default stream numbers for AMD HDMI controllers" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7546abfb8e1f9933b549f05898377e9444ee4cb2. The commit [7546abfb: ALSA: hda - Increment default stream numbers for AMD HDMI controllers] introduced a regression where the AMD HDMI playback streams don't work properly. As the simplest fix, this patch reverts that commit. The upstream code has been changed largely and already contains another fix (by changing the stream assignment order), this revert should be applied only to 3.14 kernel where the regression was introduced. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77002 Reported-by: Christian Güdel Reported-by: Anssi Hannula Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/hda_intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound') diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e354ab1ec20..a8dec9e9e87 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -297,9 +297,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; #define ULI_NUM_CAPTURE 5 #define ULI_NUM_PLAYBACK 6 -/* ATI HDMI may have up to 8 playbacks and 0 capture */ +/* ATI HDMI has 1 playback and 0 capture */ #define ATIHDMI_NUM_CAPTURE 0 -#define ATIHDMI_NUM_PLAYBACK 8 +#define ATIHDMI_NUM_PLAYBACK 1 /* TERA has 4 playback and 3 capture */ #define TERA_NUM_CAPTURE 3 -- cgit v1.2.3