mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-16 12:04:08 +00:00
ti-st: use goto-failpath in st_core_init
Use the classic failpath handling using gotos in st_core_init. That way, tty_unregister_ldisc needs not be repeated on two places. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20210505091928.22010-21-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f6f19595a7
commit
303e8ebf5d
1 changed files with 7 additions and 5 deletions
|
@ -872,9 +872,8 @@ int st_core_init(struct st_data_s **core_data)
|
|||
st_gdata = kzalloc(sizeof(struct st_data_s), GFP_KERNEL);
|
||||
if (!st_gdata) {
|
||||
pr_err("memory allocation failed");
|
||||
tty_unregister_ldisc(&st_ldisc_ops);
|
||||
err = -ENOMEM;
|
||||
return err;
|
||||
goto err_unreg_ldisc;
|
||||
}
|
||||
|
||||
/* Initialize ST TxQ and Tx waitQ queue head. All BT/FM/GPS module skb's
|
||||
|
@ -889,15 +888,18 @@ int st_core_init(struct st_data_s **core_data)
|
|||
err = st_ll_init(st_gdata);
|
||||
if (err) {
|
||||
pr_err("error during st_ll initialization(%ld)", err);
|
||||
kfree(st_gdata);
|
||||
tty_unregister_ldisc(&st_ldisc_ops);
|
||||
return err;
|
||||
goto err_free_gdata;
|
||||
}
|
||||
|
||||
INIT_WORK(&st_gdata->work_write_wakeup, work_fn_write_wakeup);
|
||||
|
||||
*core_data = st_gdata;
|
||||
return 0;
|
||||
err_free_gdata:
|
||||
kfree(st_gdata);
|
||||
err_unreg_ldisc:
|
||||
tty_unregister_ldisc(&st_ldisc_ops);
|
||||
return err;
|
||||
}
|
||||
|
||||
void st_core_exit(struct st_data_s *st_gdata)
|
||||
|
|
Loading…
Add table
Reference in a new issue