Skip to content

C
clone-Linux

gsplhtlxg / clone-Linux

通知 2
Star 0
Fork 1
C
clone-Linux

体验新版 GitCode，发现更多精彩内容 >>

提交 80986be4 编写于 作者: T Takashi Iwai
浏览文件
操作

Merge branch 'topic/caiaq' into for-linus 

* topic/caiaq:
  ALSA: snd_usb_caiaq: set mixername
上级 a6093a24 955f2d96
显示空白变更内容
内联 并排
Showing with 2 addition and 1 deletion
sound/usb/caiaq/device.c
浏览文件 @ 80986be4
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "input.h" #include "input.h"
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); 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_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3}," "{Native Instruments, RigKontrol3},"
...@@ -426,6 +426,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) ...@@ -426,6 +426,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
strlcpy(card->driver, MODNAME, sizeof(card->driver)); strlcpy(card->driver, MODNAME, sizeof(card->driver));
strlcpy(card->shortname, dev->product_name, sizeof(card->shortname)); 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 /* if the id was not passed as module option, fill it with a shortened
* version of the product string which does not contain any * version of the product string which does not contain any
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或