summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-12 20:03:06 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-12 20:03:06 +0200
commit80986be4864239dde9bb69e90be7707344f03725 (patch)
tree66fccfbed173e556d77d6b4297b41846dc862a15 /sound/usb
parenta6093a24bc7da25ce851d22ce3a7bcf1eaca4a95 (diff)
parent955f2d966534803ec32411086a1698170f17f962 (diff)
downloadlinux-80986be4864239dde9bb69e90be7707344f03725.tar.gz
linux-80986be4864239dde9bb69e90be7707344f03725.tar.bz2
linux-80986be4864239dde9bb69e90be7707344f03725.zip
Merge branch 'topic/caiaq' into for-linus
* topic/caiaq: ALSA: snd_usb_caiaq: set mixername
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/caiaq/device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index b9a2b312b83e..22406245a98b 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -35,7 +35,7 @@
#include "input.h"
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.15");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.16");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3},"
@@ -426,6 +426,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
strlcpy(card->driver, MODNAME, sizeof(card->driver));
strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
+ strlcpy(card->mixername, dev->product_name, sizeof(card->mixername));
/* if the id was not passed as module option, fill it with a shortened
* version of the product string which does not contain any