diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-05-03 10:42:58 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-03 17:30:13 +0100 |
| commit | 8f658815da156a9239b98b34e5ba1d3db71a2f6e (patch) | |
| tree | 2cab3ee1f64e8726397c3b286df2431443f87cea /sound/soc | |
| parent | ea5a137d0fe263854ae6267a0fa208c544d83452 (diff) | |
| download | blackbird-op-linux-8f658815da156a9239b98b34e5ba1d3db71a2f6e.tar.gz blackbird-op-linux-8f658815da156a9239b98b34e5ba1d3db71a2f6e.zip | |
ASoC: hdac_hdmi: Potential NULL deref in hdac_hdmi_get_spk_alloc()
We intended || here instead of &&. The original code potentially leads
to a NULL dereference.
Fixes: 2889099eb8cd ('ASoC: hdac_hdmi: Register chmap controls and ops')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewd-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Tested-by: Sachin Mokashi <sachinx.mokashi@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/hdac_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 0ed39753c871..f1170e060230 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1614,7 +1614,7 @@ static int hdac_hdmi_get_spk_alloc(struct hdac_device *hdac, int pcm_idx) struct hdac_hdmi_pcm *pcm = get_hdmi_pcm_from_id(hdmi, pcm_idx); struct hdac_hdmi_pin *pin = pcm->pin; - if (!pin && !pin->eld.eld_valid) + if (!pin || !pin->eld.eld_valid) return 0; return pin->eld.info.spk_alloc; |
