aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-06-10 15:32:01 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 21:02:31 -0400
commit955f2d966534803ec32411086a1698170f17f962 (patch)
tree77e7f1821abff1d27bf589ffcca5bf5f875093b8 /sound/usb
parentc6e24d4db824d277303201811e88626778c59999 (diff)
ALSA: snd_usb_caiaq: set mixername
alsamixer and friends want the mixername to be set. Even though the driver does not exports a real mixer device, export the name doesn't harm. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 @@
35#include "input.h" 35#include "input.h"
36 36
37MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); 37MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
38MODULE_DESCRIPTION("caiaq USB audio, version 1.3.15"); 38MODULE_DESCRIPTION("caiaq USB audio, version 1.3.16");
39MODULE_LICENSE("GPL"); 39MODULE_LICENSE("GPL");
40MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," 40MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
41 "{Native Instruments, RigKontrol3}," 41 "{Native Instruments, RigKontrol3},"
@@ -426,6 +426,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
426 426
427 strlcpy(card->driver, MODNAME, sizeof(card->driver)); 427 strlcpy(card->driver, MODNAME, sizeof(card->driver));
428 strlcpy(card->shortname, dev->product_name, sizeof(card->shortname)); 428 strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
429 strlcpy(card->mixername, dev->product_name, sizeof(card->mixername));
429 430
430 /* if the id was not passed as module option, fill it with a shortened 431 /* if the id was not passed as module option, fill it with a shortened
431 * version of the product string which does not contain any 432 * version of the product string which does not contain any