ALSA: firewire-speakers, oxygen, ua101: allow > 10 s periods
authorClemens Ladisch <clemens@ladisch.de>
Fri, 17 Jun 2011 06:17:56 +0000 (08:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 17 Jun 2011 09:36:30 +0000 (11:36 +0200)
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>
sound/firewire/speakers.c
sound/pci/oxygen/oxygen_pcm.c
sound/usb/misc/ua101.c

index 5466de8..3fc257d 100644 (file)
@@ -171,7 +171,7 @@ static int fwspk_open(struct snd_pcm_substream *substream)
 
        err = snd_pcm_hw_constraint_minmax(runtime,
                                           SNDRV_PCM_HW_PARAM_PERIOD_TIME,
-                                          5000, 8192000);
+                                          5000, UINT_MAX);
        if (err < 0)
                return err;
 
index d5533e3..cc0bcd9 100644 (file)
@@ -168,12 +168,6 @@ static int oxygen_open(struct snd_pcm_substream *substream,
                if (err < 0)
                        return err;
        }
-       if (channel == PCM_MULTICH) {
-               err = snd_pcm_hw_constraint_minmax
-                       (runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 0, 8192000);
-               if (err < 0)
-                       return err;
-       }
        snd_pcm_set_sync(substream);
        chip->streams[channel] = substream;
 
index fb5d68f..67bec76 100644 (file)
@@ -645,7 +645,7 @@ static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream,
        err = snd_pcm_hw_constraint_minmax(substream->runtime,
                                           SNDRV_PCM_HW_PARAM_PERIOD_TIME,
                                           1500000 / ua->packets_per_second,
-                                          8192000);
+                                          UINT_MAX);
        if (err < 0)
                return err;
        err = snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24);