Merge branch 'fix/hda' into topic/misc

3 files changed, 9 insertions, 6 deletions

diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 4967eabe774e..55f0647458c7 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -54,7 +54,7 @@ static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 {
         return 0;
 }
-void snd_hda_detach_beep_device(struct hda_codec *codec)
+static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
 {
 }
 #endif
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 605c99e1e520..c952582fb218 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec)
         knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
         knew->private_value = nid;
 
-        knew = via_clone_control(spec, &via_hp_mixer[1]);
-        if (knew == NULL)
-                return -ENOMEM;
-        knew->subdevice = side_mute_channel(spec);
+        nid = side_mute_channel(spec);
+        if (nid) {
+                knew = via_clone_control(spec, &via_hp_mixer[1]);
+                if (knew == NULL)
+                        return -ENOMEM;
+                knew->subdevice = nid;
+        }
 
         return 0;
 }
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 1dc6f5b1d668..3e92e5b5ec3d 100644
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip)
         lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
 }
 
-static int lola_parse_tree(struct lola *chip)
+static int __devinit lola_parse_tree(struct lola *chip)
 {
         unsigned int val;
         int nid, err;