diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:26:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:26:22 +0100 |
| commit | c988e26130132813e3550a7b97ab2ed2ae0455eb (patch) | |
| tree | 9259bd3e05c9a3f607051501ece7c252785f2e22 /sound/soc/intel/atom/sst-atom-controls.c | |
| parent | 35302156ea791f96bdc7e0ca3c44cb25341fbcb1 (diff) | |
| parent | b2047e996cd88d36eb0f4e84fe6aedab831a4b31 (diff) | |
| download | linux-c988e26130132813e3550a7b97ab2ed2ae0455eb.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/atom/sst-atom-controls.c')
| -rw-r--r-- | sound/soc/intel/atom/sst-atom-controls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index b97e6adcf1b2..98720a93de8a 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -195,7 +195,7 @@ static int sst_check_and_send_slot_map(struct sst_data *drv, struct snd_kcontrol if (e->w && e->w->power) ret = sst_send_slot_map(drv); - else + else if (!e->w) dev_err(&drv->pdev->dev, "Slot control: %s doesn't have DAPM widget!!!\n", kcontrol->id.name); return ret; |