ALSA: snd_usb_caiaq: reparent sound device
Subsystems (2)
PATCH 1/1 ALSA: snd_usb_caiaq: reparent sound device
The sound device instance needs to be a child of the USB interface, not the USB device. Newer udev versions pay attention to that.
--- sound/usb/caiaq/device.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
sound/usb/caiaq/device.c +6 -4
@@ -35,7 +35,7 @@#include "input.h" MODULE_AUTHOR ("Daniel Mack <[email protected]>" ); -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;
Signature · 1 line
1.6.3.1
At Thu, 2 Jul 2009 10:46:35 +0200,
Quoted 6 lines · 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 <[email protected]>Reported-by Lennart Poettering <[email protected]>
Applied now. Thanks.
Takashi
Quoted 54 lines
--- sound/usb/caiaq/device.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)sound/usb/caiaq/device.c +6
-4@@ -35,7 +35,7 @@#include "input.h" MODULE_AUTHOR ("Daniel Mack <[email protected]>" ); -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;Signature · 6 lines
1.6.3.1 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 10 lines · Takashi Iwai
At Thu, 2 Jul 2009 10:46:35 +0200,
Quoted 6 lines · 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 <[email protected]>Reported-by Lennart Poettering <[email protected]>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
Quoted 54 lines
Quoted 54 lines
--- sound/usb/caiaq/device.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)sound/usb/caiaq/device.c +6
-4@@ -35,7 +35,7 @@#include "input.h" MODULE_AUTHOR ("Daniel Mack <[email protected]>" ); -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;Signature · 6 lines
1.6.3.1 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
At Thu, 2 Jul 2009 11:43:44 +0200,
Quoted 11 lines · Daniel Mack
Quoted 9 lines · Takashi Iwai
At Thu, 2 Jul 2009 10:46:35 +0200,
Quoted 6 lines · 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 <[email protected]>Reported-by Lennart Poettering <[email protected]>
Quoted 6 lines
Quoted 1 line
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
---
Quoted 1 line
From
3f5d3465be8f6e04f43d9b6d543fe28d4be07d78Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
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.
--- sound/usb/usx2y/us122l.c | 2 +- sound/usb/usx2y/usbusx2y.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/usb/usx2y/us122l.c +1 -1
@@ -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 ;
sound/usb/usx2y/usbusx2y.c +1 -1
@@ -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);
Signature · 1 line
1.6.3.2