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/motu | |
| parent | ALSA: firewire: block .remove callback of bus driver till all of ALSA character devices are released (diff) | |
| download | linux-dev-5b14ec25a79bf60fc9a663fe579a500b6ac9d8ab.tar.xz linux-dev-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/motu')
| -rw-r--r-- | sound/firewire/motu/motu.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c index 12680c85b37f..281028ee3273 100644 --- a/sound/firewire/motu/motu.c +++ b/sound/firewire/motu/motu.c @@ -57,9 +57,6 @@ static void motu_free(struct snd_motu *motu) snd_motu_transaction_unregister(motu); snd_motu_stream_destroy_duplex(motu); - - mutex_destroy(&motu->mutex); - fw_unit_put(motu->unit); } /* @@ -174,10 +171,10 @@ static void motu_remove(struct fw_unit *unit) if (motu->registered) { // Block till all of ALSA character devices are released. snd_card_free(motu->card); - } else { - /* Don't forget this case. */ - motu_free(motu); } + + mutex_destroy(&motu->mutex); + fw_unit_put(motu->unit); } static void motu_bus_update(struct fw_unit *unit) |