| From 62dc8c243911ddddb5e11364e255122b00b4f6e3 Mon Sep 17 00:00:00 2001 |
| From: YueHaibing <yuehaibing@huawei.com> |
| Date: Tue, 27 Aug 2019 21:13:46 +0800 |
| Subject: [PATCH] staging: most: sound: Fix error path of audio_init |
| |
| commit 3982f1df00df57768f0782bc702fc4fbea347ca2 upstream. |
| |
| If most_register_configfs_subsys() fails, we should |
| call most_deregister_component() do cleanup. |
| |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Fixes: 919c03ae11b9 ("staging: most: enable configfs support") |
| Signed-off-by: YueHaibing <yuehaibing@huawei.com> |
| Link: https://lore.kernel.org/r/20190827131346.12704-1-yuehaibing@huawei.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c |
| index 342f390d68b3..79817061fcfa 100644 |
| --- a/drivers/staging/most/sound/sound.c |
| +++ b/drivers/staging/most/sound/sound.c |
| @@ -802,8 +802,11 @@ static int __init audio_init(void) |
| if (ret) |
| pr_err("Failed to register %s\n", comp.name); |
| ret = most_register_configfs_subsys(&comp); |
| - if (ret) |
| + if (ret) { |
| pr_err("Failed to register %s configfs subsys\n", comp.name); |
| + most_deregister_component(&comp); |
| + } |
| + |
| return ret; |
| } |
| |
| -- |
| 2.27.0 |
| |
