| Message ID | 20190906131414.15370-1-o-takashi@sakamocchi.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: firewire-lib: remove WARN_ON() at destruction of AMDTP domain | expand |
On Fri, 06 Sep 2019 15:14:14 +0200, Takashi Sakamoto wrote: > > 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> Applied, thanks. Takashi
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);
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> --- sound/firewire/amdtp-stream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)