From 88ec6899b078982bf3e0c02150b72409e8997ec2 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Fri, 16 Sep 2011 23:13:38 +0200
Subject: [PATCH] --- yaml --- r: 270431 b: refs/heads/master c:
 57e5c63007955838043e34c732d224b2cbbb128f h: refs/heads/master i:   270429:
 a99b86e4eb3e67f9e2987f00fa31732ca8e435de   270427:
 dfc0e7e7a08a73d425d1381f2bdc5494ecfd52be   270423:
 2768738c2fc01bf22b581b292fcf51edd70f892d   270415:
 02240dedd92439364cc44cc46a3e263898db331d   270399:
 05855c6fd7350b203d7d72df3497f4c7f1bf6f51 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/pci/emu10k1/emupcm.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9780e8971d92..8dcaf38aeee8 100644
--- 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
index 622bace148e3..e22b8e2bbd88 100644
--- 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;