summaryrefslogtreecommitdiff
path: root/sound/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-22 10:03:28 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-22 10:03:28 +0200
commitfdfb7fa7c9118a4112738ad86452a67107082723 (patch)
tree2c450a2f89051ed11e0ac5b8d12e773453fbc2c6 /sound/drivers
parent26e34e9e15aa48e9375ea4e97bc4234ad995b7c8 (diff)
parent1446c5fba73044a1c72153e1203b23b1820431c5 (diff)
downloadlwn-fdfb7fa7c9118a4112738ad86452a67107082723.tar.gz
lwn-fdfb7fa7c9118a4112738ad86452a67107082723.zip
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 3123a15d23f6..f2b8f868d97a 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -809,7 +809,7 @@ static int loopback_channels_get(struct snd_kcontrol *kcontrol,
ucontrol->value.integer.value[0] =
loopback->setup[kcontrol->id.subdevice]
- [kcontrol->id.device].rate;
+ [kcontrol->id.device].channels;
return 0;
}