diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2017-12-22 10:45:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-22 10:56:56 +0100 |
| commit | a36c2638380c0a4676647a1f553b70b20d3ebce1 (patch) | |
| tree | 27f06b3f900466d299e7f40a79a529ec038cf109 /sound | |
| parent | ALSA: hda - change the location for one mic on a Lenovo machine (diff) | |
| download | linux-dev-a36c2638380c0a4676647a1f553b70b20d3ebce1.tar.xz linux-dev-a36c2638380c0a4676647a1f553b70b20d3ebce1.zip | |
ALSA: hda: Drop useless WARN_ON()
Since the commit 97cc2ed27e5a ("ALSA: hda - Fix yet another i915
pointer leftover in error path") cleared hdac_acomp pointer, the
WARN_ON() non-NULL check in snd_hdac_i915_register_notifier() may give
a false-positive warning, as the function gets called no matter
whether the component is registered or not. For fixing it, let's get
rid of the spurious WARN_ON().
Fixes: 97cc2ed27e5a ("ALSA: hda - Fix yet another i915 pointer leftover in error path")
Cc: <stable@vger.kernel.org>
Reported-by: Kouta Okamoto <kouta.okamoto@toshiba.co.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/hdac_i915.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 038a180d3f81..cbe818eda336 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -325,7 +325,7 @@ static int hdac_component_master_match(struct device *dev, void *data) */ int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *aops) { - if (WARN_ON(!hdac_acomp)) + if (!hdac_acomp) return -ENODEV; hdac_acomp->audio_ops = aops; |