AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: snd_usb_caiaq: reparent sound device

Browse Source 
The sound device instance needs to be a child of the USB interface, not
the USB device. Newer udev versions pay attention to that.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Reported-by: Lennart Poettering <lennart@poettering.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Daniel Mack 2009-07-02 10:46:35 +02:00 committed by Takashi Iwai
parent 28d0325ce6
commit 563c2bf59d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/usb/caiaq/device.c
View File

@ -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.17"); MODULE_DESCRIPTION("caiaq USB audio, version 1.3.18");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3}," "{Native Instruments, RigKontrol3},"
@ -349,7 +349,9 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
log("Unable to set up control system (ret=%d)\n", ret); log("Unable to set up control system (ret=%d)\n", ret);
} }
static int create_card(struct usb_device* usb_dev, struct snd_card **cardp) static int create_card(struct usb_device *usb_dev,
struct usb_interface *intf,
struct snd_card **cardp)
{ {
int devnum; int devnum;
int err; int err;
@ -374,7 +376,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
dev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor), dev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor),
le16_to_cpu(usb_dev->descriptor.idProduct)); le16_to_cpu(usb_dev->descriptor.idProduct));
spin_lock_init(&dev->spinlock); spin_lock_init(&dev->spinlock);
snd_card_set_dev(card, &usb_dev->dev); snd_card_set_dev(card, &intf->dev);
*cardp = card; *cardp = card;
return 0; return 0;
@ -461,7 +463,7 @@ static int __devinit snd_probe(struct usb_interface *intf,
struct snd_card *card; struct snd_card *card;
struct usb_device *device = interface_to_usbdev(intf); struct usb_device *device = interface_to_usbdev(intf);
ret = create_card(device, &card); ret = create_card(device, intf, &card);
if (ret < 0) if (ret < 0)
return ret; return ret;