Merge tag 'v4.2-rc6' into asoc-topology

Linux 4.2-rc6

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 31068b8f3db0dd965cc2bdc6742684dc2cb8d8ea..73e959c105f02704218ef61327a94062352ac1b7 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -45,12 +45,12 @@
 #define SOC_TPLG_PASS_VENDOR           1
 #define SOC_TPLG_PASS_MIXER            2
 #define SOC_TPLG_PASS_WIDGET           3
-#define SOC_TPLG_PASS_GRAPH            4
-#define SOC_TPLG_PASS_PINS             5
-#define SOC_TPLG_PASS_PCM_DAI          6
+#define SOC_TPLG_PASS_PCM_DAI          4
+#define SOC_TPLG_PASS_GRAPH            5
+#define SOC_TPLG_PASS_PINS             6
 
 #define SOC_TPLG_PASS_START    SOC_TPLG_PASS_MANIFEST
-#define SOC_TPLG_PASS_END      SOC_TPLG_PASS_PCM_DAI
+#define SOC_TPLG_PASS_END      SOC_TPLG_PASS_PINS
 
 struct soc_tplg {
        const struct firmware *fw;
@@ -855,12 +855,12 @@ static int soc_tplg_denum_create_values(struct soc_enum *se,
        if (ec->items > sizeof(*ec->values))
                return -EINVAL;
 
-       se->dobj.control.dvalues =
-               kmalloc(ec->items * sizeof(u32), GFP_KERNEL);
+       se->dobj.control.dvalues = kmemdup(ec->values,
+                                          ec->items * sizeof(u32),
+                                          GFP_KERNEL);
        if (!se->dobj.control.dvalues)
                return -ENOMEM;
 
-       memcpy(se->dobj.control.dvalues, ec->values, ec->items * sizeof(u32));
        return 0;
 }
 
@@ -1093,7 +1093,7 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create(
        struct snd_soc_tplg_mixer_control *mc;
        int i, err;
 
-       kc = kzalloc(sizeof(*kc) * num_kcontrols, GFP_KERNEL);
+       kc = kcalloc(num_kcontrols, sizeof(*kc), GFP_KERNEL);
        if (kc == NULL)
                return NULL;
 
@@ -1274,7 +1274,7 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dbytes_create(
        struct snd_kcontrol_new *kc;
        int i, err;
 
-       kc = kzalloc(sizeof(*kc) * count, GFP_KERNEL);
+       kc = kcalloc(count, sizeof(*kc), GFP_KERNEL);
        if (!kc)
                return NULL;
 
@@ -1297,7 +1297,6 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dbytes_create(
                        "ASoC: adding bytes kcontrol %s with access 0x%x\n",
                        be->hdr.name, be->hdr.access);
 
-               memset(kc, 0, sizeof(*kc));
                kc[i].name = be->hdr.name;
                kc[i].private_value = (long)sbe;
                kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;