redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: dgap: introduce dgap_tty_free() for freeing channels.

Browse source 
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 <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daeseok Youn 2014-06-13 18:19:55 +09:00 committed by Greg Kroah-Hartman
parent 219a40d099
commit 08f53f61af
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/dgap/dgap.c
View file

@ -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;
@ -1487,6 +1490,18 @@ free_chan:
return ret;
}
/*
* 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()
*