lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/caiaq' into for-linus

Browse Source 
* fix/caiaq:
  ALSA: usx2y - reparent sound device
  ALSA: snd_usb_caiaq: reparent sound device
This commit is contained in:
Takashi Iwai
2009-07-02 17:48:32 +02:00
parent dc8a4f3fc3 3f5d3465be
commit cfbc78003e
3 changed files with 8 additions and 6 deletions
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;

2
sound/usb/usx2y/us122l.c
View File

@@ -514,7 +514,6 @@ static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp)
US122L(card)->chip.dev->bus->busnum, US122L(card)->chip.dev->bus->busnum,
US122L(card)->chip.dev->devnum US122L(card)->chip.dev->devnum
); );
snd_card_set_dev(card, &device->dev);
*cardp = card; *cardp = card;
return 0; return 0;
} }
@@ -531,6 +530,7 @@ static int us122l_usb_probe(struct usb_interface *intf,
if (err < 0) if (err < 0)
return err; return err;
snd_card_set_dev(card, &intf->dev);
if (!us122l_create_card(card)) { if (!us122l_create_card(card)) {
snd_card_free(card); snd_card_free(card);
return -EINVAL; return -EINVAL;

2
sound/usb/usx2y/usbusx2y.c
View File

@@ -364,7 +364,6 @@ static int usX2Y_create_card(struct usb_device *device, struct snd_card **cardp)
0,//us428(card)->usbmidi.ifnum, 0,//us428(card)->usbmidi.ifnum,
usX2Y(card)->chip.dev->bus->busnum, usX2Y(card)->chip.dev->devnum usX2Y(card)->chip.dev->bus->busnum, usX2Y(card)->chip.dev->devnum
); );
snd_card_set_dev(card, &device->dev);
*cardp = card; *cardp = card;
return 0; return 0;
} }
@@ -388,6 +387,7 @@ static int usX2Y_usb_probe(struct usb_device *device,
err = usX2Y_create_card(device, &card); err = usX2Y_create_card(device, &card);
if (err < 0) if (err < 0)
return err; return err;
snd_card_set_dev(card, &intf->dev);
if ((err = usX2Y_hwdep_new(card, device)) < 0 || if ((err = usX2Y_hwdep_new(card, device)) < 0 ||
(err = snd_card_register(card)) < 0) { (err = snd_card_register(card)) < 0) {
snd_card_free(card); snd_card_free(card);