From 6ae11f89453f98b217a6bf265de9939dde17aa8f Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Fri, 17 Jun 2011 08:17:56 +0200
Subject: [PATCH] --- yaml --- r: 257617 b: refs/heads/master c:
 f4b1e98aa93d548e5d51c8c5272ea08562fc71c1 h: refs/heads/master i:   257615:
 c696be60d96532f777d01ee753af0af54ec31240 v: v3

---
 [refs]                              | 2 +-
 trunk/sound/firewire/speakers.c     | 2 +-
 trunk/sound/pci/oxygen/oxygen_pcm.c | 6 ------
 trunk/sound/usb/misc/ua101.c        | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 3b6820258181..964a91a212b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 030aba53ea361df2b44a292606c974ef48d438de
+refs/heads/master: f4b1e98aa93d548e5d51c8c5272ea08562fc71c1
diff --git a/trunk/sound/firewire/speakers.c b/trunk/sound/firewire/speakers.c
index 5466de8527bd..3fc257da180c 100644
--- a/trunk/sound/firewire/speakers.c
+++ b/trunk/sound/firewire/speakers.c
@@ -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;
 
diff --git a/trunk/sound/pci/oxygen/oxygen_pcm.c b/trunk/sound/pci/oxygen/oxygen_pcm.c
index d5533e34ece9..cc0bcd9f3350 100644
--- a/trunk/sound/pci/oxygen/oxygen_pcm.c
+++ b/trunk/sound/pci/oxygen/oxygen_pcm.c
@@ -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;
 
diff --git a/trunk/sound/usb/misc/ua101.c b/trunk/sound/usb/misc/ua101.c
index fb5d68fa7ff4..67bec7612442 100644
--- a/trunk/sound/usb/misc/ua101.c
+++ b/trunk/sound/usb/misc/ua101.c
@@ -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);