diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:27 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:27 +0200 |
commit | fef3d2453378a4bbd73c72d4764ea1334c24cb18 (patch) | |
tree | 49da1daf4c7d5cbce4010b7ef0c9094d46d52838 /sound/usb/card.c | |
parent | 79650543698457406d093c534ae17da2e48f6cd0 (diff) | |
parent | 0472378e1e80bfc3f915f5b46935c87216111294 (diff) |
Merge topic branch 'audio' into integration-linux-ux500-3.3
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r-- | sound/usb/card.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 4a7be7b9833..e667491baee 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -445,6 +445,7 @@ snd_usb_audio_probe(struct usb_device *dev, struct usb_host_interface *alts; int ifnum; u32 id; + struct usb_device *snd_dev; alts = &intf->altsetting[0]; ifnum = get_iface_desc(alts)->bInterfaceNumber; @@ -527,6 +528,9 @@ snd_usb_audio_probe(struct usb_device *dev, usb_chip[chip->index] = chip; chip->num_interfaces++; chip->probing = 0; + snd_dev = interface_to_usbdev(intf); + usb_enable_autosuspend(snd_dev); + mutex_unlock(®ister_mutex); return chip; |