Message ID | 20171106133114.339667-1-arnd@arndb.de |
---|---|
State | Accepted |
Commit | cc20c4df1627dd515ea90dd20e2684a8a1c76693 |
Headers | show |
Series | ASoC: intel: initialize return value properly | expand |
On Mon, Nov 06, 2017 at 02:30:36PM +0100, Arnd Bergmann wrote: > When CONFIG_SND_SOC_HDAC_HDMI is disabled, we can run into an > uninitialized variable: > > sound/soc/intel/skylake/skl.c: In function 'skl_resume': > sound/soc/intel/skylake/skl.c:326:6: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized] > > I have run into this on today's linux-next kernel, but it appears > that this is an older problem that was just hard to trigger > with randconfig builds as CONFIG_SND_SOC_HDAC_HDMI would in > effect be impossible to disable when having SND_SOC_INTEL_SKYLAKE > enabled. do we need this in changelog :) Anyway this sound fine to me, so: Acked-By: Vinod Koul <vinod.koul@intel.com> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > sound/soc/intel/skylake/skl.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c > index 31d8634e8aa1..acb0ab470ca6 100644 > --- a/sound/soc/intel/skylake/skl.c > +++ b/sound/soc/intel/skylake/skl.c > @@ -355,6 +355,7 @@ static int skl_resume(struct device *dev) > > if (ebus->cmd_dma_state) > snd_hdac_bus_init_cmd_io(&ebus->bus); > + ret = 0; > } else { > ret = _skl_resume(ebus); > > -- > 2.9.0 > -- ~Vinod
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 31d8634e8aa1..acb0ab470ca6 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -355,6 +355,7 @@ static int skl_resume(struct device *dev) if (ebus->cmd_dma_state) snd_hdac_bus_init_cmd_io(&ebus->bus); + ret = 0; } else { ret = _skl_resume(ebus);
When CONFIG_SND_SOC_HDAC_HDMI is disabled, we can run into an uninitialized variable: sound/soc/intel/skylake/skl.c: In function 'skl_resume': sound/soc/intel/skylake/skl.c:326:6: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized] I have run into this on today's linux-next kernel, but it appears that this is an older problem that was just hard to trigger with randconfig builds as CONFIG_SND_SOC_HDAC_HDMI would in effect be impossible to disable when having SND_SOC_INTEL_SKYLAKE enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- sound/soc/intel/skylake/skl.c | 1 + 1 file changed, 1 insertion(+) -- 2.9.0