[PATCH] ALSA: snd_usb_caiaq: reparent sound device

[PATCH] ALSA: snd_usb_caiaq: reparent sound device

[Daniel Mack]

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>
---
 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@caiaq.de>");
-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

Re: [PATCH] ALSA: snd_usb_caiaq: reparent sound device

[Takashi Iwai]

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@caiaq.de>
> Reported-by: Lennart Poettering <lennart@poettering.net>

Applied now.  Thanks.


Takashi

> ---
>  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@caiaq.de>");
> -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@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

Re: [PATCH] ALSA: snd_usb_caiaq: reparent sound device

[Daniel Mack]

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@caiaq.de>
> > Reported-by: Lennart Poettering <lennart@poettering.net>
> 
> 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@caiaq.de>");
> > -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@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> > 

Re: [PATCH] ALSA: snd_usb_caiaq: reparent sound device

[Takashi Iwai]

At Thu, 2 Jul 2009 11:43:44 +0200,
Daniel Mack wrote:
> 
> 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@caiaq.de>
> > > Reported-by: Lennart Poettering <lennart@poettering.net>
> > 
> > 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.

It's trivial, so I did it now :)
The patch is below.


thanks,

Takashi

---
>From 3f5d3465be8f6e04f43d9b6d543fe28d4be07d78 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 2 Jul 2009 11:51:44 +0200
Subject: [PATCH] ALSA: usx2y - reparent sound device

Fix the parent device to be the USB interface, not the USB device.
A similiar commit like 563c2bf59d392357bcc1d99642933cc88c687964.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/usb/usx2y/us122l.c   |    2 +-
 sound/usb/usx2y/usbusx2y.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index a5aae9d..fd44946 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -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->devnum
 		);
-	snd_card_set_dev(card, &device->dev);
 	*cardp = card;
 	return 0;
 }
@@ -531,6 +530,7 @@ static int us122l_usb_probe(struct usb_interface *intf,
 	if (err < 0)
 		return err;
 
+	snd_card_set_dev(card, &intf->dev);
 	if (!us122l_create_card(card)) {
 		snd_card_free(card);
 		return -EINVAL;
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 5ce0da2..cb4bb83 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -364,7 +364,6 @@ static int usX2Y_create_card(struct usb_device *device, struct snd_card **cardp)
 		0,//us428(card)->usbmidi.ifnum,
 		usX2Y(card)->chip.dev->bus->busnum, usX2Y(card)->chip.dev->devnum
 		);
-	snd_card_set_dev(card, &device->dev);
 	*cardp = card;
 	return 0;
 }
@@ -388,6 +387,7 @@ static int usX2Y_usb_probe(struct usb_device *device,
 	err = usX2Y_create_card(device, &card);
 	if (err < 0)
 		return err;
+	snd_card_set_dev(card, &intf->dev);
 	if ((err = usX2Y_hwdep_new(card, device)) < 0  ||
 	    (err = snd_card_register(card)) < 0) {
 		snd_card_free(card);
-- 
1.6.3.2