Skip to content

L
linux-davinci
Commit 80986be4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'topic/caiaq' into for-linus 

* topic/caiaq:
  ALSA: snd_usb_caiaq: set mixername
parents a6093a24 955f2d96
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sound/usb/caiaq/device.c
View file @ 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% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment