aboutsummaryrefslogtreecommitdiff
path: root/sound/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-04 08:46:38 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-04 08:46:38 +0200
commit628cfe870f0b413b0a15b26fe3b949eb02fe2dc2 (patch)
tree1414afb0db25706a657b8257cb6ba4bfcd6e2128 /sound/drivers
parentc76a544feb63b10883acff9a59cd989c6b438cd3 (diff)
parentac446fb7e690b317050ed158ba5dfd9273dc9e74 (diff)
downloadvexpress-lsk-628cfe870f0b413b0a15b26fe3b949eb02fe2dc2.tar.gz
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/aloop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 2748fee8d40..040030aa9d8 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -739,7 +739,7 @@ static int loopback_active_get(struct snd_kcontrol *kcontrol,
{
struct loopback *loopback = snd_kcontrol_chip(kcontrol);
struct loopback_cable *cable = loopback->cables
- [kcontrol->id.subdevice][kcontrol->id.device];
+ [kcontrol->id.subdevice][kcontrol->id.device ^ 1];
unsigned int val = 0;
if (cable != NULL)