ALSA: hda - Allow calling snd_hdac_i915_*() without actual binding
Add the missing NULL checks so that snd_hdac_i915*() can be called
even after the binding with i915 failed.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index cb78c25..442500e 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -27,7 +27,7 @@
{
struct i915_audio_component *acomp = bus->audio_component;
- if (!acomp->ops)
+ if (!acomp || !acomp->ops)
return -ENODEV;
if (!acomp->ops->codec_wake_override) {
@@ -49,7 +49,7 @@
{
struct i915_audio_component *acomp = bus->audio_component;
- if (!acomp->ops)
+ if (!acomp || !acomp->ops)
return -ENODEV;
dev_dbg(bus->dev, "display power %s\n",
@@ -72,7 +72,7 @@
{
struct i915_audio_component *acomp = bus->audio_component;
- if (!acomp->ops)
+ if (!acomp || !acomp->ops)
return -ENODEV;
return acomp->ops->get_cdclk_freq(acomp->dev);
@@ -179,8 +179,11 @@
struct device *dev = bus->dev;
struct i915_audio_component *acomp = bus->audio_component;
+ if (!acomp)
+ return 0;
+
WARN_ON(bus->i915_power_refcount);
- if (bus->i915_power_refcount > 0 && acomp && acomp->ops)
+ if (bus->i915_power_refcount > 0 && acomp->ops)
acomp->ops->put_power(acomp->dev);
component_master_del(dev, &hdac_component_master_ops);