diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-06-17 02:17:56 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-06-17 05:36:30 -0400 |
commit | f4b1e98aa93d548e5d51c8c5272ea08562fc71c1 (patch) | |
tree | f75f81831cee3f33225f9bc408b10fc127221df6 | |
parent | 030aba53ea361df2b44a292606c974ef48d438de (diff) |
ALSA: firewire-speakers, oxygen, ua101: allow > 10 s periods
Since commit f2b3614cefb6 (Don't check DMA time-out too shortly),
drivers need no longer restrict their PCM period length to be shorter
than 10 seconds.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/firewire/speakers.c | 2 | ||||
-rw-r--r-- | sound/pci/oxygen/oxygen_pcm.c | 6 | ||||
-rw-r--r-- | sound/usb/misc/ua101.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c index 5466de8527bd..3fc257da180c 100644 --- a/sound/firewire/speakers.c +++ b/sound/firewire/speakers.c | |||
@@ -171,7 +171,7 @@ static int fwspk_open(struct snd_pcm_substream *substream) | |||
171 | 171 | ||
172 | err = snd_pcm_hw_constraint_minmax(runtime, | 172 | err = snd_pcm_hw_constraint_minmax(runtime, |
173 | SNDRV_PCM_HW_PARAM_PERIOD_TIME, | 173 | SNDRV_PCM_HW_PARAM_PERIOD_TIME, |
174 | 5000, 8192000); | 174 | 5000, UINT_MAX); |
175 | if (err < 0) | 175 | if (err < 0) |
176 | return err; | 176 | return err; |
177 | 177 | ||
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c index d5533e34ece9..cc0bcd9f3350 100644 --- a/sound/pci/oxygen/oxygen_pcm.c +++ b/sound/pci/oxygen/oxygen_pcm.c | |||
@@ -168,12 +168,6 @@ static int oxygen_open(struct snd_pcm_substream *substream, | |||
168 | if (err < 0) | 168 | if (err < 0) |
169 | return err; | 169 | return err; |
170 | } | 170 | } |
171 | if (channel == PCM_MULTICH) { | ||
172 | err = snd_pcm_hw_constraint_minmax | ||
173 | (runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 0, 8192000); | ||
174 | if (err < 0) | ||
175 | return err; | ||
176 | } | ||
177 | snd_pcm_set_sync(substream); | 171 | snd_pcm_set_sync(substream); |
178 | chip->streams[channel] = substream; | 172 | chip->streams[channel] = substream; |
179 | 173 | ||
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index fb5d68fa7ff4..67bec7612442 100644 --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c | |||
@@ -645,7 +645,7 @@ static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream, | |||
645 | err = snd_pcm_hw_constraint_minmax(substream->runtime, | 645 | err = snd_pcm_hw_constraint_minmax(substream->runtime, |
646 | SNDRV_PCM_HW_PARAM_PERIOD_TIME, | 646 | SNDRV_PCM_HW_PARAM_PERIOD_TIME, |
647 | 1500000 / ua->packets_per_second, | 647 | 1500000 / ua->packets_per_second, |
648 | 8192000); | 648 | UINT_MAX); |
649 | if (err < 0) | 649 | if (err < 0) |
650 | return err; | 650 | return err; |
651 | err = snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24); | 651 | err = snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24); |