diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2016-03-31 01:47:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-31 15:36:17 +0200 |
| commit | 44c376b9596ca00d1bdee37e716d1bd4dd36c955 (patch) | |
| tree | c4924408e819b03f2faa43cd05938c369da8f169 /sound/firewire | |
| parent | ALSA: hda - Fix yet another i915 pointer leftover in error path (diff) | |
| download | linux-44c376b9596ca00d1bdee37e716d1bd4dd36c955.tar.xz linux-44c376b9596ca00d1bdee37e716d1bd4dd36c955.zip | |
ALSA: firewire-lib: suppress kernel warnings when releasing uninitialized stream data
When any of AMDTP stream data are not initialized and private data is
going to be released, WARN_ON() in amdtp_stream_destroy() is hit and
dump messages. This may take users irritated.
This commit fixes the bug to skip releasing when it's not initialized.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index ed2902609a4c..4484242da0e6 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -102,6 +102,10 @@ EXPORT_SYMBOL(amdtp_stream_init); */ void amdtp_stream_destroy(struct amdtp_stream *s) { + /* Not initialized. */ + if (s->protocol == NULL) + return; + WARN_ON(amdtp_stream_running(s)); kfree(s->protocol); mutex_destroy(&s->mutex); |