Merge branch 'topic/hda-refresh-cleanup' into for-next

Merge a cleanup for HD-audio widget refresh code

Signed-off-by: Takashi Iwai <tiwai@suse.de>

6 files changed, 25 insertions, 17 deletions

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index f49af557bdb0..612a17e375d0 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -120,7 +120,7 @@ void snd_hdac_device_unregister(struct hdac_device *codec);
 int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name);
 int snd_hdac_codec_modalias(struct hdac_device *hdac, char *buf, size_t size);
 
-int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs);
+int snd_hdac_refresh_widgets(struct hdac_device *codec);
 
 unsigned int snd_hdac_make_cmd(struct hdac_device *codec, hda_nid_t nid,
                                unsigned int verb, unsigned int parm);
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
index 4769f4c03e14..a265c1d68876 100644
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
@@ -89,7 +89,7 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus,
 
         fg = codec->afg ? codec->afg : codec->mfg;
 
-        err = snd_hdac_refresh_widgets(codec, false);
+        err = snd_hdac_refresh_widgets(codec);
         if (err < 0)
                 goto error;
 
@@ -394,32 +394,35 @@ static void setup_fg_nodes(struct hdac_device *codec)
 /**
  * snd_hdac_refresh_widgets - Reset the widget start/end nodes
  * @codec: the codec object
- * @sysfs: re-initialize sysfs tree, too
  */
-int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs)
+int snd_hdac_refresh_widgets(struct hdac_device *codec)
 {
         hda_nid_t start_nid;
-        int nums, err;
+        int nums, err = 0;
 
+        /*
+         * Serialize against multiple threads trying to update the sysfs
+         * widgets array.
+         */
+        mutex_lock(&codec->widget_lock);
         nums = snd_hdac_get_sub_nodes(codec, codec->afg, &start_nid);
         if (!start_nid || nums <= 0 || nums >= 0xff) {
                 dev_err(&codec->dev, "cannot read sub nodes for FG 0x%02x\n",
                         codec->afg);
-                return -EINVAL;
+                err = -EINVAL;
+                goto unlock;
         }
 
-        if (sysfs) {
-                mutex_lock(&codec->widget_lock);
-                err = hda_widget_sysfs_reinit(codec, start_nid, nums);
-                mutex_unlock(&codec->widget_lock);
-                if (err < 0)
-                        return err;
-        }
+        err = hda_widget_sysfs_reinit(codec, start_nid, nums);
+        if (err < 0)
+                goto unlock;
 
         codec->num_nodes = nums;
         codec->start_nid = start_nid;
         codec->end_nid = start_nid + nums;
-        return 0;
+unlock:
+        mutex_unlock(&codec->widget_lock);
+        return err;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_refresh_widgets);
 
diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c
index 909d5ef1179c..e56e83325903 100644
--- a/sound/hda/hdac_sysfs.c
+++ b/sound/hda/hdac_sysfs.c
@@ -428,7 +428,7 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec,
         int i;
 
         if (!codec->widgets)
-                return hda_widget_sysfs_init(codec);
+                return 0;
 
         tree = kmemdup(codec->widgets, sizeof(*tree), GFP_KERNEL);
         if (!tree)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index ccb53f1c1e1a..7d8834907f1f 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1016,7 +1016,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
         hda_nid_t fg;
         int err;
 
-        err = snd_hdac_refresh_widgets(&codec->core, true);
+        err = snd_hdac_refresh_widgets(&codec->core);
         if (err < 0)
                 return err;
 
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 660e0587f399..6302ad5b7128 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -2043,7 +2043,7 @@ static int hdac_hdmi_dev_probe(struct hdac_device *hdev)
                         "Failed in parse and map nid with err: %d\n", ret);
                 return ret;
         }
-        snd_hdac_refresh_widgets(hdev, true);
+        snd_hdac_refresh_widgets(hdev);
 
         /* ASoC specific initialization */
         ret = devm_snd_soc_register_component(&hdev->dev, &hdmi_hda_codec,
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index 72c6f8e82a7e..78c2d6cab3b5 100644
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -560,6 +560,11 @@ int line6_init_pcm(struct usb_line6 *line6,
         line6pcm->max_packet_size_out =
                 usb_maxpacket(line6->usbdev,
                         usb_sndisocpipe(line6->usbdev, ep_write), 1);
+        if (!line6pcm->max_packet_size_in || !line6pcm->max_packet_size_out) {
+                dev_err(line6pcm->line6->ifcdev,
+                        "cannot get proper max packet size\n");
+                return -EINVAL;
+        }
 
         spin_lock_init(&line6pcm->out.lock);
         spin_lock_init(&line6pcm->in.lock);