3 files changed, 10 insertions, 7 deletions

diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index 204cc074adb9..41aa3355e920 100644
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -55,7 +55,6 @@ static int snd_line6_impulse_volume_put(struct snd_kcontrol *kcontrol,
                 err = line6_pcm_acquire(line6pcm, LINE6_STREAM_IMPULSE);
                 if (err < 0) {
                         line6pcm->impulse_volume = 0;
-                        line6_pcm_release(line6pcm, LINE6_STREAM_IMPULSE);
                         return err;
                 }
         } else {
@@ -211,7 +210,9 @@ static void line6_stream_stop(struct snd_line6_pcm *line6pcm, int direction,
         spin_lock_irqsave(&pstr->lock, flags);
         clear_bit(type, &pstr->running);
         if (!pstr->running) {
+                spin_unlock_irqrestore(&pstr->lock, flags);
                 line6_unlink_audio_urbs(line6pcm, pstr);
+                spin_lock_irqsave(&pstr->lock, flags);
                 if (direction == SNDRV_PCM_STREAM_CAPTURE) {
                         line6pcm->prev_fbuf = NULL;
                         line6pcm->prev_fsize = 0;
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index daf81d169a42..45dd34874f43 100644
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -244,8 +244,8 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
 static ssize_t serial_number_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
+        struct snd_card *card = dev_to_snd_card(dev);
+        struct usb_line6_pod *pod = card->private_data;
 
         return sprintf(buf, "%u\n", pod->serial_number);
 }
@@ -256,8 +256,8 @@ static ssize_t serial_number_show(struct device *dev,
 static ssize_t firmware_version_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
+        struct snd_card *card = dev_to_snd_card(dev);
+        struct usb_line6_pod *pod = card->private_data;
 
         return sprintf(buf, "%d.%02d\n", pod->firmware_version / 100,
                        pod->firmware_version % 100);
@@ -269,8 +269,8 @@ static ssize_t firmware_version_show(struct device *dev,
 static ssize_t device_id_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
 {
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
+        struct snd_card *card = dev_to_snd_card(dev);
+        struct usb_line6_pod *pod = card->private_data;
 
         return sprintf(buf, "%d\n", pod->device_id);
 }
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 6adde457b602..6cf1f3597455 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1128,6 +1128,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
 {
         /* devices which do not support reading the sample rate. */
         switch (chip->usb_id) {
+        case USB_ID(0x041E, 0x4080): /* Creative Live Cam VF0610 */
         case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema  */
         case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */
         case USB_ID(0x045E, 0x076E): /* MS Lifecam HD-5001 */
@@ -1138,6 +1139,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
         case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */
         case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
         case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
+        case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */
         case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
         case USB_ID(0x1de7, 0x0013): /* Phoenix Audio MT202exe */
         case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */