aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:29 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:29 -0400
commit2f0dabcc5f5fde67c64a6f71e9fb369aed39d56f (patch)
tree4c61e9509a84bed2646b302d74aa066377091477 /sound/pci
parent19b1a15a3de2b3b6367c968e65bffe9503556ef1 (diff)
parent806d31d73843a018cb239fc16ba53d82f4d8dc33 (diff)
Merge branch 'topic/emu10k1' into for-linus
* topic/emu10k1: ALSA: emu10k1 - Fix minimum periods for efx playback
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/emu10k1/emupcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 78f62fd404c2..55b83ef73c63 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1736,7 +1736,7 @@ static struct snd_pcm_hardware snd_emu10k1_fx8010_playback =
1736 .buffer_bytes_max = (128*1024), 1736 .buffer_bytes_max = (128*1024),
1737 .period_bytes_min = 1024, 1737 .period_bytes_min = 1024,
1738 .period_bytes_max = (128*1024), 1738 .period_bytes_max = (128*1024),
1739 .periods_min = 1, 1739 .periods_min = 2,
1740 .periods_max = 1024, 1740 .periods_max = 1024,
1741 .fifo_size = 0, 1741 .fifo_size = 0,
1742}; 1742};