---

yaml --- r: 270431 b: refs/heads/master c: 57e5c63 h: refs/heads/master i: 270429: a99b86e 270427: dfc0e7e 270423: 2768738 270415: 02240de 270399: 05855c6 v: v3
git-mirror · Sep 20, 2011 · 88ec689 · 88ec689
1 parent e55b9a4
commit 88ec689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b0416a3c2f301e67d307ffc26ba43dff2d0d435
+refs/heads/master: 57e5c63007955838043e34c732d224b2cbbb128f
diff --git a/trunk/sound/pci/emu10k1/emupcm.c b/trunk/sound/pci/emu10k1/emupcm.c
@@ -1146,6 +1146,11 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream)
 		kfree(epcm);
 		return err;
 	}
+	err = snd_pcm_hw_rule_noresample(runtime, 48000);
+	if (err < 0) {
+		kfree(epcm);
+		return err;
+	}
 	mix = &emu->pcm_mixer[substream->number];
 	for (i = 0; i < 4; i++)
 		mix->send_routing[0][i] = mix->send_routing[1][i] = mix->send_routing[2][i] = i;