diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2018-10-10 15:35:00 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-10-10 12:11:41 +0200 |
| commit | 5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab (patch) | |
| tree | 011033efd4ac1674da01c16ef438092f32a48243 /sound/firewire/fireworks | |
| parent | 61ccc6f6b27c03bb32ca38a3c580d49ce1612d43 (diff) | |
| download | linux-5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab.tar.gz linux-5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab.tar.bz2 linux-5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab.zip | |
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/fireworks')
| -rw-r--r-- | sound/firewire/fireworks/fireworks.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index 5a17ead86e61..5854d2a87a18 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -188,9 +188,6 @@ static void efw_free(struct snd_efw *efw) { snd_efw_stream_destroy_duplex(efw); snd_efw_transaction_remove_instance(efw); - - mutex_destroy(&efw->mutex); - fw_unit_put(efw->unit); } /* @@ -360,10 +357,10 @@ static void efw_remove(struct fw_unit *unit) if (efw->registered) { // Block till all of ALSA character devices are released. snd_card_free(efw->card); - } else { - /* Don't forget this case. */ - efw_free(efw); } + + mutex_destroy(&efw->mutex); + fw_unit_put(efw->unit); } static const struct ieee1394_device_id efw_id_table[] = { |