summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-09-06 22:14:14 +0900
committerTakashi Iwai <tiwai@suse.de>2019-09-07 08:39:23 +0200
commit8d0d5c3fa16f050024ff13df106b70466aacbf3b (patch)
tree561303ff3305734615eed1ad2fa33080adb69c5f
parente6e2fe2b8f7a4abd24170225050597ebc9f1427b (diff)
downloadlinux-8d0d5c3fa16f050024ff13df106b70466aacbf3b.tar.gz
linux-8d0d5c3fa16f050024ff13df106b70466aacbf3b.tar.bz2
linux-8d0d5c3fa16f050024ff13df106b70466aacbf3b.zip
ALSA: firewire-lib: remove WARN_ON() at destruction of AMDTP domain
The destructor of AMDTP domain has WARN_ON() for the list of associated AMDTP stream. Although this reminds a case that developers forget to program consumer drivers to stop AMDTP domain, it hits when AMDTP domain is not initialized yet. This occurs when initialization of sound card fails as well and it's superfluous. This commit removes the WARN_ON. Although the API to AMDTP domain does nothing, it's left for future usage. Fixes: 3ec3d7a3ff106 ("ALSA: firewire-lib: add AMDTP domain structure to handle several isoc contexts") Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/r/20190906131414.15370-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/firewire/amdtp-stream.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 88270257e896..e50e28f77e74 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -1153,7 +1153,8 @@ EXPORT_SYMBOL_GPL(amdtp_domain_init);
*/
void amdtp_domain_destroy(struct amdtp_domain *d)
{
- WARN_ON(!list_empty(&d->streams));
+ // At present nothing to do.
+ return;
}
EXPORT_SYMBOL_GPL(amdtp_domain_destroy);