---

yaml --- r: 133215 b: refs/heads/master c: eab2b55 h: refs/heads/master i: 133213: 7d7666b 133211: 76a1380 133207: 9d01c3a 133199: 691da16 133183: 8cd0a13 v: v3
git-mirror · Mar 2, 2009 · cdb2994 · cdb2994
1 parent f842276
commit cdb2994
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3990e610a157e9c36af85a75bc66260dff31f40
+refs/heads/master: eab2b553c3d3ed20698c4a9c7e049a60b804e2f5
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
@@ -1783,7 +1783,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs)
 			if (rates[f->format] && rates[f->format] != f->rates)
 				goto __out;
 		}
-		channels[f->format] |= (1 << f->channels);
+		channels[f->format] |= 1 << (f->channels - 1);
 		rates[f->format] |= f->rates;
 		/* needs knot? */
 		if (f->rates & SNDRV_PCM_RATE_KNOT)
@@ -1810,7 +1810,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs)
 			continue;
 		for (i = 0; i < 32; i++) {
 			if (f->rates & (1 << i))
-				channels[i] |= (1 << f->channels);
+				channels[i] |= 1 << (f->channels - 1);
 		}
 	}
 	cmaster = 0;