]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: Intel: Fix the driver data not set issue
authorJie Yang <yang.jie@intel.com>
Tue, 4 Nov 2014 06:45:24 +0000 (14:45 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 4 Nov 2014 11:44:08 +0000 (11:44 +0000)
The priv_data is allocated again here wrongly, and it
is not set to the driver data after assignment. This
make the pdata->dev is NULL and oops occurs on the first
call to hsw_volume_put.

The resource has been allocated in driver probe callback
hsw_pcm_dev_probe, so here just remove this sencond
allocation is OK.

Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/sst-haswell-pcm.c

index cd54dd9967afbf8cf6a6cd48e7f29fea149865e1..093b9393ae46e54dc25fbe6d68d96ee24fb3d11b 100644 (file)
@@ -868,7 +868,6 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)
        dev = platform->dev;
        dma_dev = pdata->dma_dev;
 
-       priv_data = devm_kzalloc(platform->dev, sizeof(*priv_data), GFP_KERNEL);
        priv_data->hsw = pdata->dsp;
        priv_data->dev = platform->dev;
        priv_data->pm_state = HSW_PM_STATE_D0;