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/caiaq/caiaq-device.c | |
| parent | 8924c671b668169289f8f4b70518b3aa96e454df (diff) | |
| parent | 913ae5a24efd27deef4fc154953871b62d0d99cd (diff) | |
Merge branch 'topic/usbaudio' into for-linus
Diffstat (limited to 'sound/usb/caiaq/caiaq-device.c')
| -rw-r--r-- | sound/usb/caiaq/caiaq-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c index b143ef7152f7..a62500e387a6 100644 --- a/sound/usb/caiaq/caiaq-device.c +++ b/sound/usb/caiaq/caiaq-device.c @@ -446,7 +446,7 @@ static int __devinit snd_probe(struct usb_interface *intf, if (!card) return -ENOMEM; - dev_set_drvdata(&intf->dev, card); + usb_set_intfdata(intf, card); ret = init_card(caiaqdev(card)); if (ret < 0) { log("unable to init card! (ret=%d)\n", ret); @@ -460,7 +460,7 @@ static int __devinit snd_probe(struct usb_interface *intf, static void snd_disconnect(struct usb_interface *intf) { struct snd_usb_caiaqdev *dev; - struct snd_card *card = dev_get_drvdata(&intf->dev); + struct snd_card *card = usb_get_intfdata(intf); debug("%s(%p)\n", __func__, intf); |