5 files changed, 7 insertions, 6 deletions

diff --git a/sound/core/seq/seq_compat.c b/sound/core/seq/seq_compat.c
index fce5697e4261..8c3507216676 100644
--- a/sound/core/seq/seq_compat.c
+++ b/sound/core/seq/seq_compat.c
@@ -58,7 +58,7 @@ static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned
                 goto error;
         data->kernel = NULL;
 
-        err = snd_seq_kernel_client_ctl(client->number, cmd, &data);
+        err = snd_seq_kernel_client_ctl(client->number, cmd, data);
         if (err < 0)
                 goto error;
 
diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c
index 9c22f95838ef..19d41da79f93 100644
--- a/sound/pci/hda/dell_wmi_helper.c
+++ b/sound/pci/hda/dell_wmi_helper.c
@@ -49,7 +49,7 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
                 removefunc = true;
                 if (dell_led_set_func(DELL_LED_MICMUTE, false) >= 0) {
                         dell_led_value = 0;
-                        if (spec->gen.num_adc_nids > 1)
+                        if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch)
                                 codec_dbg(codec, "Skipping micmute LED control due to several ADCs");
                         else {
                                 dell_old_cap_hook = spec->gen.cap_sync_hook;
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c
index f0955fd7a2e7..6a23302297c9 100644
--- a/sound/pci/hda/thinkpad_helper.c
+++ b/sound/pci/hda/thinkpad_helper.c
@@ -62,7 +62,7 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
                         removefunc = false;
                 }
                 if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) {
-                        if (spec->num_adc_nids > 1)
+                        if (spec->num_adc_nids > 1 && !spec->dyn_adc_switch)
                                 codec_dbg(codec,
                                           "Skipping micmute LED control due to several ADCs");
                         else {
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 14e587e70655..90009c0b3a92 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -604,8 +604,8 @@ line6_hwdep_write(struct snd_hwdep *hwdep, const char __user *data, long count,
         }
 
         data_copy = memdup_user(data, count);
-        if (IS_ERR(ERR_PTR))
-                return -ENOMEM;
+        if (IS_ERR(data_copy))
+                return PTR_ERR(data_copy);
 
         rv = line6_send_raw_message(line6, data_copy, count);
 
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index 9352a44ae6e4..49cd4a65e390 100644
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -317,7 +317,8 @@ static int podhd_init(struct usb_line6 *line6,
         if (pod->line6.properties->capabilities & LINE6_CAP_PCM) {
                 /* initialize PCM subsystem: */
                 err = line6_init_pcm(line6,
-                        (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties :
+                        (id->driver_info == LINE6_PODX3 ||
+                        id->driver_info == LINE6_PODX3LIVE) ? &podx3_pcm_properties :
                         &podhd_pcm_properties);
                 if (err < 0)
                         return err;