diff options
| author | Jie Yang <yang.jie@intel.com> | 2014-11-04 07:45:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-04 12:44:08 +0100 |
| commit | e648f6add20d1cfb5945e24b5bffe5843476645b (patch) | |
| tree | 16e9edde7d2e67129bc83016ce2d9e89a49beaee /sound/soc | |
| parent | ASoC: Intel: Correct a macro for FW message (diff) | |
| download | linux-e648f6add20d1cfb5945e24b5bffe5843476645b.tar.xz linux-e648f6add20d1cfb5945e24b5bffe5843476645b.zip | |
ASoC: Intel: Fix the driver data not set issue
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/intel/sst-haswell-pcm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index cd54dd9967af..093b9393ae46 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -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; |