On Thu, Jul 02, 2009 at 11:04:48AM +0200, Takashi Iwai wrote:
> At Thu, 2 Jul 2009 10:46:35 +0200,
> Daniel Mack wrote:
> >
> > 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@xxxxxxxx>
> > Reported-by: Lennart Poettering <lennart@xxxxxxxxxxxxxx>
>
> Applied now. Thanks.
Thanks. The usx2y driver would need something similar as well, but I
didn't test it since I don't have the hardware to test.
Cc'ed Karsten Wiese for that.
Daniel
> > ---
> > sound/usb/caiaq/device.c | 10 ++++++----
> > 1 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
> > index 0e5db71..de38108 100644
> > --- a/sound/usb/caiaq/device.c
> > +++ b/sound/usb/caiaq/device.c
> > @@ -35,7 +35,7 @@
> > #include "input.h"
> >
> > MODULE_AUTHOR("Daniel Mack <daniel@xxxxxxxx>");
> > -MODULE_DESCRIPTION("caiaq USB audio, version 1.3.17");
> > +MODULE_DESCRIPTION("caiaq USB audio, version 1.3.18");
> > MODULE_LICENSE("GPL");
> > MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
> > "{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);
> > }
> >
> > -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 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),
> > le16_to_cpu(usb_dev->descriptor.idProduct));
> > spin_lock_init(&dev->spinlock);
> > - snd_card_set_dev(card, &usb_dev->dev);
> > + snd_card_set_dev(card, &intf->dev);
> >
> > *cardp = card;
> > return 0;
> > @@ -461,7 +463,7 @@ static int __devinit snd_probe(struct usb_interface *intf,
> > struct snd_card *card;
> > struct usb_device *device = interface_to_usbdev(intf);
> >
> > - ret = create_card(device, &card);
> > + ret = create_card(device, intf, &card);
> >
> > if (ret < 0)
> > return ret;
> > --
> > 1.6.3.1
> >
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@xxxxxxxxxxxxxxxx
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> >
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
