From cdb29948c11a1458a6eba3d72e884d7dea901b5f Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 2 Mar 2009 11:45:50 +0100
Subject: [PATCH] --- yaml --- r: 133215 b: refs/heads/master c:
 eab2b553c3d3ed20698c4a9c7e049a60b804e2f5 h: refs/heads/master i:   133213:
 7d7666b542a064d1a314d90c7ecb9e9865e444f0   133211:
 76a1380c43e9e9e5ad8bb471ad85cf454975dcfa   133207:
 9d01c3ad6dd475ee5bf5e05bb2590d119914f12e   133199:
 691da16b7fa89b160c4b68444f9049d5088acc47   133183:
 8cd0a13a7d2f49fc7da81302df374224c7de8811 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/usbaudio.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 44d0a30f054f..fceb9736e288 100644
--- 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
index 2b24496ddec7..f853b627cf43 100644
--- 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;