Merge remote branch 'alsa/devel' into topic/misc

fdfb7fa7 · Takashi Iwai · 26e34e9e · 1446c5fb · fdfb7fa7
Commit fdfb7fa7 authored Sep 22, 2010 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/drivers/aloop.c sound/drivers/aloop.c +1 -1

No files found.
--- 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;
 }