From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Daniel Vetter <daniel.vetter@intel.com>, intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/3] ALSA: hda - Immediately fail if the i915 audio component is disabled
Date: Thu, 7 Apr 2016 12:57:23 +0200 [thread overview]
Message-ID: <1460026644-30479-3-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1460026644-30479-1-git-send-email-tiwai@suse.de>
Since i915 notifies its disabled state via the stub component binding,
we can bail out immediately once when the disabled flag is detected.
Based on the original patch by Imre Deak <imre.deak@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/hda/hdac_i915.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 6800e0c5a38f..812777f9af1f 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -223,8 +223,18 @@ static int hdac_component_master_bind(struct device *dev)
if (ret < 0)
return ret;
- if (WARN_ON(!(acomp->dev && acomp->ops && acomp->ops->get_power &&
- acomp->ops->put_power && acomp->ops->get_cdclk_freq))) {
+ if (WARN_ON(!(acomp->dev && acomp->ops))) {
+ ret = -EINVAL;
+ goto out_unbind;
+ }
+
+ if (acomp->ops->disabled) {
+ ret = -ENODEV;
+ goto out_unbind;
+ }
+
+ if (WARN_ON(!(acomp->ops->get_power && acomp->ops->put_power &&
+ acomp->ops->get_cdclk_freq))) {
ret = -EINVAL;
goto out_unbind;
}
@@ -342,7 +352,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
*/
request_module("i915");
- if (!acomp->ops) {
+ if (!acomp->ops || acomp->ops->disabled) {
ret = -ENODEV;
goto out_master_del;
}
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-04-07 10:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 10:57 [PATCH 0/3] More robust i915 / audio binding Takashi Iwai
2016-04-07 10:57 ` [PATCH 1/3] drm/i915/hda: Add audio component stub Takashi Iwai
2016-04-07 11:55 ` Ville Syrjälä
2016-04-07 12:30 ` Imre Deak
2016-04-25 12:46 ` Takashi Iwai
2016-04-07 10:57 ` Takashi Iwai [this message]
2016-04-07 10:57 ` [PATCH 3/3] ALSA: hda - Support deferred i915 audio component binding Takashi Iwai
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=1460026644-30479-3-git-send-email-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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;
as well as URLs for NNTP newsgroup(s).