]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: wm_adsp: Accept 0 as a parameter block address
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Jan 2013 16:29:51 +0000 (00:29 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 26 Jan 2013 03:39:44 +0000 (11:39 +0800)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm_adsp.c

index 99f00f879c5e6576106df76e302a2adbafab4bab..888316484541d55991e1506f2c40dc062e66845e 100644 (file)
@@ -590,27 +590,21 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                                  be32_to_cpu(adsp1_alg[i].dm),
                                  be32_to_cpu(adsp1_alg[i].zm));
 
-                       if (adsp1_alg[i].dm) {
-                               region = kzalloc(sizeof(*region), GFP_KERNEL);
-                               if (!region)
-                                       return -ENOMEM;
-                               region->type = WMFW_ADSP1_DM;
-                               region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
-                               region->base = be32_to_cpu(adsp1_alg[i].dm);
-                               list_add_tail(&region->list,
-                                             &dsp->alg_regions);
-                       }
+                       region = kzalloc(sizeof(*region), GFP_KERNEL);
+                       if (!region)
+                               return -ENOMEM;
+                       region->type = WMFW_ADSP1_DM;
+                       region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
+                       region->base = be32_to_cpu(adsp1_alg[i].dm);
+                       list_add_tail(&region->list, &dsp->alg_regions);
 
-                       if (adsp1_alg[i].zm) {
-                               region = kzalloc(sizeof(*region), GFP_KERNEL);
-                               if (!region)
-                                       return -ENOMEM;
-                               region->type = WMFW_ADSP1_ZM;
-                               region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
-                               region->base = be32_to_cpu(adsp1_alg[i].zm);
-                               list_add_tail(&region->list,
-                                             &dsp->alg_regions);
-                       }
+                       region = kzalloc(sizeof(*region), GFP_KERNEL);
+                       if (!region)
+                               return -ENOMEM;
+                       region->type = WMFW_ADSP1_ZM;
+                       region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
+                       region->base = be32_to_cpu(adsp1_alg[i].zm);
+                       list_add_tail(&region->list, &dsp->alg_regions);
                        break;
 
                case WMFW_ADSP2:
@@ -624,38 +618,29 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                                  be32_to_cpu(adsp2_alg[i].ym),
                                  be32_to_cpu(adsp2_alg[i].zm));
 
-                       if (adsp2_alg[i].xm) {
-                               region = kzalloc(sizeof(*region), GFP_KERNEL);
-                               if (!region)
-                                       return -ENOMEM;
-                               region->type = WMFW_ADSP2_XM;
-                               region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
-                               region->base = be32_to_cpu(adsp2_alg[i].xm);
-                               list_add_tail(&region->list,
-                                             &dsp->alg_regions);
-                       }
+                       region = kzalloc(sizeof(*region), GFP_KERNEL);
+                       if (!region)
+                               return -ENOMEM;
+                       region->type = WMFW_ADSP2_XM;
+                       region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
+                       region->base = be32_to_cpu(adsp2_alg[i].xm);
+                       list_add_tail(&region->list, &dsp->alg_regions);
 
-                       if (adsp2_alg[i].ym) {
-                               region = kzalloc(sizeof(*region), GFP_KERNEL);
-                               if (!region)
-                                       return -ENOMEM;
-                               region->type = WMFW_ADSP2_YM;
-                               region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
-                               region->base = be32_to_cpu(adsp2_alg[i].ym);
-                               list_add_tail(&region->list,
-                                             &dsp->alg_regions);
-                       }
+                       region = kzalloc(sizeof(*region), GFP_KERNEL);
+                       if (!region)
+                               return -ENOMEM;
+                       region->type = WMFW_ADSP2_YM;
+                       region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
+                       region->base = be32_to_cpu(adsp2_alg[i].ym);
+                       list_add_tail(&region->list, &dsp->alg_regions);
 
-                       if (adsp2_alg[i].zm) {
-                               region = kzalloc(sizeof(*region), GFP_KERNEL);
-                               if (!region)
-                                       return -ENOMEM;
-                               region->type = WMFW_ADSP2_ZM;
-                               region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
-                               region->base = be32_to_cpu(adsp2_alg[i].zm);
-                               list_add_tail(&region->list,
-                                             &dsp->alg_regions);
-                       }
+                       region = kzalloc(sizeof(*region), GFP_KERNEL);
+                       if (!region)
+                               return -ENOMEM;
+                       region->type = WMFW_ADSP2_ZM;
+                       region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
+                       region->base = be32_to_cpu(adsp2_alg[i].zm);
+                       list_add_tail(&region->list, &dsp->alg_regions);
                        break;
                }
        }