ASoC: Intel: Skylake: fix uninitialized pointer use
authorArnd Bergmann <>
Thu, 27 Apr 2017 10:59:58 +0000 (12:59 +0200)
committerMark Brown <>
Sun, 30 Apr 2017 12:46:49 +0000 (21:46 +0900)
The error handling in bxt_sst_dsp_init() got changed in a way that
it now derefences an uninitialized pointer when printing a warning
about the device not being found:

sound/soc/intel/skylake/bxt-sst.c: In function 'bxt_sst_dsp_init':
sound/soc/intel/skylake/bxt-sst.c:567:14: error: 'skl' may be used uninitialized in this function [-Werror=maybe-uninitialized]

As we do have a valid device pointer available at the call site,
let's use that instead.

Fixes: 9fe9c7119283 ("ASoC: Intel: Skylake: Move sst common initialization to a helper function")
Signed-off-by: Arnd Bergmann <>
Reviewed-by: Takashi Sakamoto <>
Signed-off-by: Mark Brown <>

index fde4bc0f35b041f4f9b69ae1b11aa05cd135c79b..f5e7dbb1ba39e073fc1ee7212bb558962a85c987 100644 (file)
@@ -564,7 +564,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
        ret = skl_sst_ctx_init(dev, irq, fw_name, dsp_ops, dsp, &skl_dev);
        if (ret < 0) {
-               dev_err(skl->dev, "%s: no device\n", __func__);
+               dev_err(dev, "%s: no device\n", __func__);
                return ret;