From dc970caadb7bdc69d0699cb9bea99e2b4f7fd83d Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Wed, 30 Nov 2022 13:23:15 -0800 Subject: [PATCH] Revert "audio kernel: add null point check for lpass cdc." This reverts commit bfbf93e9f882d6a1ef6a56fffecfb265bcd6bcb0. Change-Id: Id5e9e84b18e809831618639a0bf8f0497eb82bd3 Signed-off-by: Phani Kumar Uppalapati --- asoc/codecs/lpass-cdc/lpass-cdc.c | 4 ++-- dsp/digital-cdc-rsc-mgr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asoc/codecs/lpass-cdc/lpass-cdc.c b/asoc/codecs/lpass-cdc/lpass-cdc.c index 3d092a5de8..5805033a14 100644 --- a/asoc/codecs/lpass-cdc/lpass-cdc.c +++ b/asoc/codecs/lpass-cdc/lpass-cdc.c @@ -1378,7 +1378,7 @@ int lpass_cdc_runtime_resume(struct device *dev) trace_printk("%s, enter\n", __func__); dev_dbg(dev,"%s, enter\n", __func__); mutex_lock(&priv->vote_lock); - if ((priv->lpass_core_hw_vote == NULL) || (priv->lpass_core_hw_vote->core == NULL)) { + if (priv->lpass_core_hw_vote == NULL) { dev_dbg(dev, "%s: Invalid lpass core hw node\n", __func__); goto audio_vote; } @@ -1396,7 +1396,7 @@ int lpass_cdc_runtime_resume(struct device *dev) __func__, priv->core_hw_vote_count); audio_vote: - if ((priv->lpass_audio_hw_vote == NULL) || (priv->lpass_audio_hw_vote->core == NULL)) { + if (priv->lpass_audio_hw_vote == NULL) { dev_dbg(dev, "%s: Invalid lpass audio hw node\n", __func__); goto done; } diff --git a/dsp/digital-cdc-rsc-mgr.c b/dsp/digital-cdc-rsc-mgr.c index a8852d6492..c69fea55a3 100644 --- a/dsp/digital-cdc-rsc-mgr.c +++ b/dsp/digital-cdc-rsc-mgr.c @@ -35,7 +35,7 @@ int digital_cdc_rsc_mgr_hw_vote_enable(struct clk *vote_handle, struct device *d ret = clk_prepare_enable(vote_handle); mutex_unlock(&hw_vote_lock); - dev_err(dev, "%s: return %d\n", __func__, ret); + dev_dbg(dev, "%s: return %d\n", __func__, ret); trace_printk("%s: return %d\n", __func__, ret); return ret; }