ASoC: rt5514: Fix the issue that the variable dereferenced before checking

oder-chiou · broonie · commit b63d4d13ac7b · 2016-06-22T16:02:04.000+01:00
The patch fixes the issue that variable dereferenced before checking
'rt5514_dsp-&gt;substream'. Move the assignment to after the variable
checking of 'rt5514_dsp-&gt;substream'.

Signed-off-by: Oder Chiou &lt;oder_chiou@realtek.com&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c
@@ -80,7 +80,7 @@ static void rt5514_spi_copy_work(struct work_struct *work)
 {
 	struct rt5514_dsp *rt5514_dsp =
 		container_of(work, struct rt5514_dsp, copy_work.work);
-	struct snd_pcm_runtime *runtime = rt5514_dsp->substream->runtime;
+	struct snd_pcm_runtime *runtime;
 	size_t period_bytes, truncated_bytes = 0;
 
 	mutex_lock(&rt5514_dsp->dma_lock);
@@ -89,6 +89,7 @@ static void rt5514_spi_copy_work(struct work_struct *work)
 		goto done;
 	}
 
+	runtime = rt5514_dsp->substream->runtime;
 	period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream);
 
 	if (rt5514_dsp->buf_size - rt5514_dsp->dsp_offset <  period_bytes)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static void rt5514_spi_copy_work(struct work_struct *work)`
`80`	`80`	`{`
`81`	`81`	`struct rt5514_dsp *rt5514_dsp =`
`82`	`82`	`container_of(work, struct rt5514_dsp, copy_work.work);`
`83`		`- struct snd_pcm_runtime *runtime = rt5514_dsp->substream->runtime;`
	`83`	`+ struct snd_pcm_runtime *runtime;`
`84`	`84`	`size_t period_bytes, truncated_bytes = 0;`
`85`	`85`
`86`	`86`	`mutex_lock(&rt5514_dsp->dma_lock);`
`@@ -89,6 +89,7 @@ static void rt5514_spi_copy_work(struct work_struct *work)`
`89`	`89`	`goto done;`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ runtime = rt5514_dsp->substream->runtime;`
`92`	`93`	`period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream);`
`93`	`94`
`94`	`95`	`if (rt5514_dsp->buf_size - rt5514_dsp->dsp_offset < period_bytes)`