diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-04 02:46:38 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-04 02:46:38 -0400 |
| commit | 628cfe870f0b413b0a15b26fe3b949eb02fe2dc2 (patch) | |
| tree | 1414afb0db25706a657b8257cb6ba4bfcd6e2128 /sound | |
| parent | c76a544feb63b10883acff9a59cd989c6b438cd3 (diff) | |
| parent | ac446fb7e690b317050ed158ba5dfd9273dc9e74 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound')
| -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 2748fee8d405..040030aa9d8e 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c | |||
| @@ -739,7 +739,7 @@ static int loopback_active_get(struct snd_kcontrol *kcontrol, | |||
| 739 | { | 739 | { |
| 740 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); | 740 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); |
| 741 | struct loopback_cable *cable = loopback->cables | 741 | struct loopback_cable *cable = loopback->cables |
| 742 | [kcontrol->id.subdevice][kcontrol->id.device]; | 742 | [kcontrol->id.subdevice][kcontrol->id.device ^ 1]; |
| 743 | unsigned int val = 0; | 743 | unsigned int val = 0; |
| 744 | 744 | ||
| 745 | if (cable != NULL) | 745 | if (cable != NULL) |