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/us122l.c | |
| parent | 8924c671b668169289f8f4b70518b3aa96e454df (diff) | |
| parent | 913ae5a24efd27deef4fc154953871b62d0d99cd (diff) | |
Merge branch 'topic/usbaudio' into for-linus
Diffstat (limited to 'sound/usb/usx2y/us122l.c')
| -rw-r--r-- | sound/usb/usx2y/us122l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index c2515b680f9..73e59f4403a 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c @@ -589,7 +589,7 @@ static int snd_us122l_suspend(struct usb_interface *intf, pm_message_t message) struct us122l *us122l; struct list_head *p; - card = dev_get_drvdata(&intf->dev); + card = usb_get_intfdata(intf); if (!card) return 0; snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); @@ -615,7 +615,7 @@ static int snd_us122l_resume(struct usb_interface *intf) struct list_head *p; int err; - card = dev_get_drvdata(&intf->dev); + card = usb_get_intfdata(intf); if (!card) return 0; |