diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-09-22 10:03:28 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-22 10:03:28 +0200 |
| commit | fdfb7fa7c9118a4112738ad86452a67107082723 (patch) | |
| tree | 2c450a2f89051ed11e0ac5b8d12e773453fbc2c6 | |
| parent | ALSA: usb/mixer: remove bogus cast (diff) | |
| parent | ALSA: snd-aloop - fix the "PCM Playback Channels" kcontrol (diff) | |
| download | linux-dev-fdfb7fa7c9118a4112738ad86452a67107082723.tar.xz linux-dev-fdfb7fa7c9118a4112738ad86452a67107082723.zip | |
Merge remote branch 'alsa/devel' into topic/misc
| -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 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; } |