diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-05-06 15:07:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-05-06 15:07:57 +0200 |
| commit | 17b89c80319c2a66d33142112e06bf15893e6ecb (patch) | |
| tree | 443ece3125ff837129735a2e0b579f61bb56a5bc /sound/core/init.c | |
| parent | 78ff2afc26251741bcdf5668990bb6278e68adcd (diff) | |
| parent | 3887c26c0e24d50a4d0ce20cf4726737cee1a2fd (diff) | |
| download | linux-17b89c80319c2a66d33142112e06bf15893e6ecb.tar.gz linux-17b89c80319c2a66d33142112e06bf15893e6ecb.tar.bz2 linux-17b89c80319c2a66d33142112e06bf15893e6ecb.zip | |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 356d41e4f3a4..d64416f0a281 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -401,14 +401,7 @@ int snd_card_disconnect(struct snd_card *card) card->shutdown = 1; spin_unlock(&card->files_lock); - /* phase 1: disable fops (user space) operations for ALSA API */ - mutex_lock(&snd_card_mutex); - snd_cards[card->number] = NULL; - clear_bit(card->number, snd_cards_lock); - mutex_unlock(&snd_card_mutex); - - /* phase 2: replace file->f_op with special dummy operations */ - + /* replace file->f_op with special dummy operations */ spin_lock(&card->files_lock); list_for_each_entry(mfile, &card->files_list, list) { /* it's critical part, use endless loop */ @@ -424,7 +417,7 @@ int snd_card_disconnect(struct snd_card *card) } spin_unlock(&card->files_lock); - /* phase 3: notify all connected devices about disconnection */ + /* notify all connected devices about disconnection */ /* at this point, they cannot respond to any calls except release() */ #if IS_ENABLED(CONFIG_SND_MIXER_OSS) @@ -440,6 +433,13 @@ int snd_card_disconnect(struct snd_card *card) device_del(&card->card_dev); card->registered = false; } + + /* disable fops (user space) operations for ALSA API */ + mutex_lock(&snd_card_mutex); + snd_cards[card->number] = NULL; + clear_bit(card->number, snd_cards_lock); + mutex_unlock(&snd_card_mutex); + #ifdef CONFIG_PM wake_up(&card->power_sleep); #endif |