media: cec: Fix debugfs leak on bus_register() failure

commit c43bcd2b2aa3c2ca9d2433c3990ecbc2c47d10eb upstream.

In cec_devnode_init(), the debugfs directory created with
debugfs_create_dir() is not removed if bus_register() fails.
This leaves a stale "cec" entry in debugfs and prevents
proper module reloading.

Fix this by removing the debugfs directory in the error path.

Fixes: a56960e8b406 ("[media] cec: add HDMI CEC framework (core)")
Cc: stable@vger.kernel.org
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/cec/core/cec-core.c b/drivers/media/cec/core/cec-core.c
index 48282d272fe649a281874f60a48dbd8a99b951a6..865d86f34add0eac37f691e1e4295f6535f5c974 100644 (file)
--- a/drivers/media/cec/core/cec-core.c
+++ b/drivers/media/cec/core/cec-core.c
@@ -420,6 +420,7 @@ static int __init cec_devnode_init(void)
 
        ret = bus_register(&cec_bus_type);
        if (ret < 0) {
+               debugfs_remove_recursive(top_cec_dir);
                unregister_chrdev_region(cec_dev_t, CEC_NUM_DEVICES);
                pr_warn("cec: bus_register failed\n");
                return -EIO;