github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: cec: core: consolidate error path in cec_allocate_adapter()

Browse Source 
Consolidate error path in cec_allocate_adapter() so next changes
will be less verbose.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Andy Shevchenko 2026-07-09 10:20:53 +02:00 committed by Hans Verkuil
parent bf40cc53b1
commit fa17e189bb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/cec/core/cec-core.c
View File

@ -267,8 +267,7 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
if (IS_ERR(adap->kthread)) {
pr_err("cec-%s: kernel_thread() failed\n", name);
res = PTR_ERR(adap->kthread);
kfree(adap);
return ERR_PTR(res);
goto err_free_adap;
}
#ifdef CONFIG_MEDIA_CEC_RC
@ -281,8 +280,8 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
pr_err("cec-%s: failed to allocate memory for rc_dev\n",
name);
kthread_stop(adap->kthread);
kfree(adap);
return ERR_PTR(-ENOMEM);
res = -ENOMEM;
goto err_free_adap;
}
snprintf(adap->input_phys, sizeof(adap->input_phys),
@ -301,6 +300,10 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
adap->rc->timeout = MS_TO_US(550);
#endif
return adap;
err_free_adap:
kfree(adap);
return ERR_PTR(res);
}
EXPORT_SYMBOL_GPL(cec_allocate_adapter);