| commit | fdfb7fa7c9118a4112738ad86452a67107082723 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Sep 22 10:03:28 2010 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Sep 22 10:03:28 2010 +0200 |
| tree | 2c450a2f89051ed11e0ac5b8d12e773453fbc2c6 | |
| parent | 26e34e9e15aa48e9375ea4e97bc4234ad995b7c8 [diff] | |
| parent | 1446c5fba73044a1c72153e1203b23b1820431c5 [diff] |
Merge remote branch 'alsa/devel' into topic/misc
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 3123a15..f2b8f86 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c
@@ -809,7 +809,7 @@ ucontrol->value.integer.value[0] = loopback->setup[kcontrol->id.subdevice] - [kcontrol->id.device].rate; + [kcontrol->id.device].channels; return 0; }