diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-13 10:23:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-13 10:23:18 +0200 |
| commit | 9a4f35865ffcb2f4603375eadabe0d475fab1a0f (patch) | |
| tree | 1465ac717deee029d3a9c1f7235ba85be57feefa /sound/core/init.c | |
| parent | eef0342cf32689f77d78ee3302999e5caaa6a8f3 (diff) | |
| parent | c30cf8cbe55413cd643a0bdd3442d75950caa918 (diff) | |
Merge branch 'for-next' into for-linus
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 35419054821c..04734e047bfe 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) { |