staging: dgap: introduce dgap_tty_free() for freeing channels.
PATCH 3/9 staging: dgap: introduce dgap_tty_free() for freeing channels.
It should be called after dgap_tty_register_ports() is failed. So channels which are allocated in dgap_tty_init() will be freed.
Signed-off-by Daeseok Youn <[email protected]>
--- drivers/staging/dgap/dgap.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-)
drivers/staging/dgap/dgap.c +16 -1
@@ -123,6 +123,7 @@ static void dgap_tty_send_xchar(struct tty_struct *tty, char ch);static int dgap_tty_register (struct board_t *brd);static int dgap_tty_init (struct board_t *); +static void dgap_tty_free (struct board_t *);static void dgap_cleanup_tty (struct board_t *);static void dgap_carrier (struct channel_t *ch);static void dgap_input (struct channel_t *ch);
@@ -960,8 +961,10 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type)return ret; ret =dgap_tty_register_ports (brd); -if (ret) +if (ret) { +dgap_tty_free (brd);return ret; + } brd->state =BOARD_READY ; brd->dpastatus =BD_RUNNING ;
@@ -1488,6 +1491,18 @@ free_chan: }/* +* dgap_tty_free() +* +* Free the channles which are allocated in dgap_tty_init(). +*/ +static void dgap_tty_free (struct board_t *brd) +{ +int i; + +for (i =0 ; i < brd->nasync; i++) +kfree (brd->channels[i]); +} +/* * dgap_cleanup_tty() * * Uninitialize the TTY portion of this driver. Free all memory and
Signature · 1 line
1.7.1