diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2018-10-10 09:35:00 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-10-10 13:11:41 +0300 |
| commit | 5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab (patch) | |
| tree | 011033efd4ac1674da01c16ef438092f32a48243 /sound/firewire/fireface | |
| parent | 61ccc6f6b27c03bb32ca38a3c580d49ce1612d43 (diff) | |
| download | linux-5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab.tar.xz | |
ALSA: firewire: release reference count of firewire unit in .remove callback of bus driver
In a previous commit, drivers in ALSA firewire stack blocks .remove
callback of bus driver. This enables to release members of private
data in the callback after releasing device of sound card.
This commit simplifies codes to release the members.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/fireface')
| -rw-r--r-- | sound/firewire/fireface/ff.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/firewire/fireface/ff.c b/sound/firewire/fireface/ff.c index 73425dfe63bf..37866beeb160 100644 --- a/sound/firewire/fireface/ff.c +++ b/sound/firewire/fireface/ff.c @@ -31,9 +31,6 @@ static void ff_free(struct snd_ff *ff) { snd_ff_stream_destroy_duplex(ff); snd_ff_transaction_unregister(ff); - - mutex_destroy(&ff->mutex); - fw_unit_put(ff->unit); } static void ff_card_free(struct snd_card *card) @@ -147,10 +144,10 @@ static void snd_ff_remove(struct fw_unit *unit) if (ff->registered) { // Block till all of ALSA character devices are released. snd_card_free(ff->card); - } else { - /* Don't forget this case. */ - ff_free(ff); } + + mutex_destroy(&ff->mutex); + fw_unit_put(ff->unit); } static const struct snd_ff_spec spec_ff400 = { |