diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2018-10-10 15:34:59 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-10-10 12:11:34 +0200 |
| commit | 61ccc6f6b27c03bb32ca38a3c580d49ce1612d43 (patch) | |
| tree | 7db489b32d390c7627693eec90e3488d7c3a21ec /sound/firewire/oxfw | |
| parent | d06fb562bff5d14defdacbd92449bacbaedd5cdf (diff) | |
ALSA: firewire: block .remove callback of bus driver till all of ALSA character devices are released
At present, in .remove callback of bus driver just decrease reference
count of device for ALSA card instance. This delegates release of the
device to a process in which the last of ALSA character device is
released.
On the other hand, the other drivers such as for devices on PCIe are
programmed to block .remove callback of bus driver till all of ALSA
character devices are released.
For consistency of behaviour for whole drivers, this probably confuses
users. This commit takes drivers in ALSA firewire stack to imitate the
above behaviour.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw')
| -rw-r--r-- | sound/firewire/oxfw/oxfw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c index 6ac551786b93..36f905b371e6 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -327,8 +327,8 @@ static void oxfw_remove(struct fw_unit *unit) cancel_delayed_work_sync(&oxfw->dwork); if (oxfw->registered) { - /* No need to wait for releasing card object in this context. */ - snd_card_free_when_closed(oxfw->card); + // Block till all of ALSA character devices are released. + snd_card_free(oxfw->card); } else { /* Don't forget this case. */ oxfw_free(oxfw); |