From: libin.yang@linux.intel.com
To: intel-gfx@lists.freedesktop.org, conselvan2@gmail.com,
jani.nikula@linux.intel.com, ville.syrjala@linux.intel.com,
daniel.vetter@intel.com, tiwai@suse.de
Cc: Libin Yang <libin.yang@linux.intel.com>
Subject: [PATCH] drm/i915: add audio_ptr pointer check
Date: Wed, 2 Mar 2016 10:24:31 +0800 [thread overview]
Message-ID: <1456885471-29344-1-git-send-email-libin.yang@linux.intel.com> (raw)
From: Libin Yang <libin.yang@linux.intel.com>
check to make sure audio_ptr is not NULL before
using it.
Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
---
drivers/gpu/drm/i915/intel_audio.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 31f6d21..667596d 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -529,7 +529,8 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
intel_dig_port->audio_connector = connector;
mutex_unlock(&dev_priv->av_mutex);
- if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
+ if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify &&
+ acomp->audio_ops->audio_ptr)
acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);
}
@@ -556,7 +557,8 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
intel_dig_port->audio_connector = NULL;
mutex_unlock(&dev_priv->av_mutex);
- if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
+ if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify &&
+ acomp->audio_ops->audio_ptr)
acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);
}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-03-02 2:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 2:24 libin.yang [this message]
2016-03-02 7:44 ` [PATCH] drm/i915: add audio_ptr pointer check Takashi Iwai
2016-03-02 7:59 ` Yang, Libin
2016-03-02 8:56 ` Takashi Iwai
2016-03-03 3:01 ` Yang, Libin
2016-03-02 8:00 ` Jani Nikula
2016-03-02 8:31 ` ✗ Fi.CI.BAT: warning for " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456885471-29344-1-git-send-email-libin.yang@linux.intel.com \
--to=libin.yang@linux.intel.com \
--cc=conselvan2@gmail.com \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=tiwai@suse.de \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox