diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-27 18:01:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-03 11:26:28 +0100 |
| commit | e086e3035e0691b362755d1b5e24df631eee335a (patch) | |
| tree | b803d38bb739c3de78d7ed74fd99b397fa9ecfe7 /sound/core/init.c | |
| parent | 61ca4107a16828559e2463e49b87002990da0b98 (diff) | |
| download | op-kernel-dev-e086e3035e0691b362755d1b5e24df631eee335a.zip op-kernel-dev-e086e3035e0691b362755d1b5e24df631eee335a.tar.gz | |
ALSA: core: Re-add snd_device_disconnect()
Revive snd_device_disconnect() again so that it can be called from the
individual driver. This time, HD-audio will need it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 3541905..04734e0 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -400,7 +400,6 @@ static const struct file_operations snd_shutdown_f_ops = int snd_card_disconnect(struct snd_card *card) { struct snd_monitor_file *mfile; - int err; if (!card) return -EINVAL; @@ -445,9 +444,7 @@ int snd_card_disconnect(struct snd_card *card) #endif /* notify all devices that we are disconnected */ - err = snd_device_disconnect_all(card); - if (err < 0) - dev_err(card->dev, "not all devices for card %i can be disconnected\n", card->number); + snd_device_disconnect_all(card); snd_info_card_disconnect(card); if (card->registered) { |
