diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-10-04 08:46:38 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-04 08:46:38 +0200 |
commit | 628cfe870f0b413b0a15b26fe3b949eb02fe2dc2 (patch) | |
tree | 1414afb0db25706a657b8257cb6ba4bfcd6e2128 /sound/drivers | |
parent | c76a544feb63b10883acff9a59cd989c6b438cd3 (diff) | |
parent | ac446fb7e690b317050ed158ba5dfd9273dc9e74 (diff) | |
download | linux-3.10-628cfe870f0b413b0a15b26fe3b949eb02fe2dc2.tar.gz linux-3.10-628cfe870f0b413b0a15b26fe3b949eb02fe2dc2.tar.bz2 linux-3.10-628cfe870f0b413b0a15b26fe3b949eb02fe2dc2.zip |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/drivers')
-rw-r--r-- | sound/drivers/aloop.c | 2 |
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) |