From d67210838a3fbeea1cf64a533a65d07516cfa9a2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 24 Jun 2010 08:07:28 +0200
Subject: [PATCH] --- yaml --- r: 206658 b: refs/heads/master c:
 b415ec7041429bb2cde3419e9556049fe12bf27a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b85cce5d6333..659e76bfe5d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8d4dcfd423b01ef7ea7c3c97720764b7adb6df
+refs/heads/master: b415ec7041429bb2cde3419e9556049fe12bf27a
diff --git a/trunk/sound/usb/mixer.c b/trunk/sound/usb/mixer.c
index 035a77bd67a6..c166db0057d3 100644
--- a/trunk/sound/usb/mixer.c
+++ b/trunk/sound/usb/mixer.c
@@ -306,7 +306,7 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
 		}
 	}
 	snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
-		    request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type);
+		    request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type);
 	return -EINVAL;
 }