From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 17 Sep 2007 07:37:47 +0000 (+0200)
Subject: [ALSA] cmipci: allow 96 kHz playback on non-multichannel rear
X-Git-Tag: v2.6.24-rc1~832^2~61
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=22a22f5aacdbb73ca605d34df76201a2df0fe8ac;p=karo-tx-linux.git

[ALSA] cmipci: allow 96 kHz playback on non-multichannel rear

Move the code that enables 96 kHz out of the if() that checks for
availability of both DMA channels so that it is enabled even when
another stream is playing on the front channels.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
---

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index c33c1c778693..51ba704d4bc9 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -1623,14 +1623,14 @@ static int snd_cmipci_playback2_open(struct snd_pcm_substream *substream)
 			else if (cm->max_channels == 8)
 				snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &hw_constraints_channels_8);
 		}
-		if (cm->chip_version == 68) {
-			runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
-					     SNDRV_PCM_RATE_96000;
-			runtime->hw.rate_max = 96000;
-		}
-		snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
 	}
 	mutex_unlock(&cm->open_mutex);
+	if (cm->chip_version == 68) {
+		runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+				     SNDRV_PCM_RATE_96000;
+		runtime->hw.rate_max = 96000;
+	}
+	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
 	return 0;
 }