Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Revert the check of NO_PRESENCE pincfg default bit
  ALSA: hda - Fix a regression for DMA-position check with CA0110
  ALSA: hda - Fix silent output regression with ALC861
  ALSA: control: remove compilation warning on 32-bit
  ALSA: ua101: fix crash when unplugging

1 files changed, 21 insertions, 7 deletions

diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 67bec7612442..c0609c210303 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -459,7 +459,8 @@ static void kill_stream_urbs(struct ua101_stream *stream)
         unsigned int i;
 
         for (i = 0; i < stream->queue_length; ++i)
-                usb_kill_urb(&stream->urbs[i]->urb);
+                if (stream->urbs[i])
+                        usb_kill_urb(&stream->urbs[i]->urb);
 }
 
 static int enable_iso_interface(struct ua101 *ua, unsigned int intf_index)
@@ -484,6 +485,9 @@ static void disable_iso_interface(struct ua101 *ua, unsigned int intf_index)
 {
         struct usb_host_interface *alts;
 
+        if (!ua->intf[intf_index])
+                return;
+
         alts = ua->intf[intf_index]->cur_altsetting;
         if (alts->desc.bAlternateSetting != 0) {
                 int err = usb_set_interface(ua->dev,
@@ -1144,27 +1148,37 @@ static void free_stream_urbs(struct ua101_stream *stream)
 {
         unsigned int i;
 
-        for (i = 0; i < stream->queue_length; ++i)
+        for (i = 0; i < stream->queue_length; ++i) {
                 kfree(stream->urbs[i]);
+                stream->urbs[i] = NULL;
+        }
 }
 
 static void free_usb_related_resources(struct ua101 *ua,
                                        struct usb_interface *interface)
 {
         unsigned int i;
+        struct usb_interface *intf;
 
+        mutex_lock(&ua->mutex);
         free_stream_urbs(&ua->capture);
         free_stream_urbs(&ua->playback);
+        mutex_unlock(&ua->mutex);
         free_stream_buffers(ua, &ua->capture);
         free_stream_buffers(ua, &ua->playback);
 
-        for (i = 0; i < ARRAY_SIZE(ua->intf); ++i)
-                if (ua->intf[i]) {
-                        usb_set_intfdata(ua->intf[i], NULL);
-                        if (ua->intf[i] != interface)
+        for (i = 0; i < ARRAY_SIZE(ua->intf); ++i) {
+                mutex_lock(&ua->mutex);
+                intf = ua->intf[i];
+                ua->intf[i] = NULL;
+                mutex_unlock(&ua->mutex);
+                if (intf) {
+                        usb_set_intfdata(intf, NULL);
+                        if (intf != interface)
                                 usb_driver_release_interface(&ua101_driver,
-                                                             ua->intf[i]);
+                                                             intf);
                 }
+        }
 }
 
 static void ua101_card_free(struct snd_card *card)