diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-01-05 10:53:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-05 10:53:58 +0100 |
| commit | cd8faac38c1c4ff2b404d808f6c623ab47e06475 (patch) | |
| tree | 554666b304cfe5c650be3fd857cfdfe7b1f9cae3 /sound/usb/usx2y/usbusx2y.c | |
| parent | Merge branch 'topic/hda' into for-linus (diff) | |
| parent | ALSA: sound/usb: Use negated usb_endpoint_xfer_control, etc (diff) | |
| download | linux-dev-cd8faac38c1c4ff2b404d808f6c623ab47e06475.tar.xz linux-dev-cd8faac38c1c4ff2b404d808f6c623ab47e06475.zip | |
Merge branch 'topic/usbaudio' into for-linus
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.c')
| -rw-r--r-- | sound/usb/usx2y/usbusx2y.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index e5981a630314..ca26c532e77e 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c @@ -392,7 +392,7 @@ static int snd_usX2Y_probe(struct usb_interface *intf, const struct usb_device_i void *chip; chip = usX2Y_usb_probe(interface_to_usbdev(intf), intf, id); if (chip) { - dev_set_drvdata(&intf->dev, chip); + usb_set_intfdata(intf, chip); return 0; } else return -EIO; @@ -401,7 +401,7 @@ static int snd_usX2Y_probe(struct usb_interface *intf, const struct usb_device_i static void snd_usX2Y_disconnect(struct usb_interface *intf) { usX2Y_usb_disconnect(interface_to_usbdev(intf), - dev_get_drvdata(&intf->dev)); + usb_get_intfdata(intf)); } MODULE_DEVICE_TABLE(usb, snd_usX2Y_usb_id_table); |