Commit 3f5d3465 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: usx2y - reparent sound device

Fix the parent device to be the USB interface, not the USB device.
A similiar commit like 563c2bf5.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 563c2bf5
...@@ -514,7 +514,6 @@ static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp) ...@@ -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, ...@@ -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;
......
...@@ -364,7 +364,6 @@ static int usX2Y_create_card(struct usb_device *device, struct snd_card **cardp) ...@@ -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, ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment