[PATCH] ASoC: hdac_hdmi: Potential NULL deref in hdac_hdmi_get_spk_alloc()

From: Dan Carpenter
Date: Tue May 03 2016 - 03:42:58 EST


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@xxxxxxxxxx>
Reviewd-by: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>
Acked-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Tested-by: Sachin Mokashi <sachinx.mokashi@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
---
sound/soc/codecs/hdac_hdmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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;
--
2.8.1