[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20140613074035.GA31603@devel.8.8.4.4>
Date: Fri, 13 Jun 2014 16:40:35 +0900
From: Daeseok Youn <daeseok.youn@...il.com>
To: lidza.louina@...il.com, gregkh@...uxfoundation.org
Cc: markh@...pro.net, dan.carpenter@...cle.com,
driverdev-devel@...uxdriverproject.org, devel@...verdev.osuosl.org,
linux-kernel@...r.kernel.org
Subject: [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 <daeseok.youn@...il.com>
---
drivers/staging/dgap/dgap.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 352eb1b..eab8fd5 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -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
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists