• S
    ASoC: fsl-asoc-card: Fix build warning for maybe-uninitialized · 5f37671e
    Shengjiu Wang 提交于
    When build fsl-asoc-card as module, there is following error:
    
    sound/soc/fsl/fsl-asoc-card.c: In function 'fsl_asoc_card_probe':
    >> sound/soc/fsl/fsl-asoc-card.c:547:13: warning: 'asrc_np' may be used uninitialized in this function [-Wmaybe-uninitialized]
         of_node_put(asrc_np);
                    ^
    
    vim +/asrc_np +547 sound/soc/fsl/fsl-asoc-card.c
    
       531                  if (width == 24)
       532                          priv->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
       533                  else
       534                          priv->asrc_format = SNDRV_PCM_FORMAT_S16_LE;
       535          }
       536
       537          /* Finish card registering */
       538          platform_set_drvdata(pdev, priv);
       539          snd_soc_card_set_drvdata(&priv->card, priv);
       540
       541          ret = devm_snd_soc_register_card(&pdev->dev, &priv->card);
       542          if (ret)
       543                  dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
       544
       545  fail:
       546          of_node_put(codec_np);
     > 547          of_node_put(asrc_np);
       548          of_node_put(cpu_np);
       549
       550          return ret;
       551  }
       552
       553  static const struct of_device_id fsl_asoc_card_dt_ids[] = {
       554          { .compatible = "fsl,imx-audio-cs42888", },
       555          { .compatible = "fsl,imx-audio-sgtl5000", },
    
    Add 'asrc_fail' branch for error jump after asrc_np initialized.
    Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
    Signed-off-by: NShengjiu Wang <shengjiu.wang@freescale.com>
    Signed-off-by: NMark Brown <broonie@linaro.org>
    5f37671e
fsl-asoc-card.c 15.8 KB