aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/dgap
diff options
context:
space:
mode:
authorDaeseok Youn <daeseok.youn@gmail.com>2014-06-13 18:21:04 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 15:23:32 -0700
commit78a7966ec8f3f5d0d7b02fd01af04e960800342e (patch)
tree9c061ba2833c9530df6bcd5719ac6f737708d80e /drivers/staging/dgap
parent08f53f61afd1fdba7f50409e6da10b7484c24aa6 (diff)
downloadlinux-stericsson-78a7966ec8f3f5d0d7b02fd01af04e960800342e.tar.gz
staging: dgap: introduce dgap_free_irq()
dgap_free_irq() will free the irq which is requested in dgap_request_irq(). Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
-rw-r--r--drivers/staging/dgap/dgap.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index eab8fd56f55b..497e6f375c05 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -190,6 +190,7 @@ static void dgap_do_conc_load(struct board_t *brd, u8 *uaddr, int len);
#endif
static int dgap_after_config_loaded(struct board_t *brd);
static int dgap_request_irq(struct board_t *brd);
+static void dgap_free_irq(struct board_t *brd);
static void dgap_get_vpd(struct board_t *brd);
static void dgap_do_reset_board(struct board_t *brd);
@@ -634,8 +635,7 @@ static void dgap_cleanup_board(struct board_t *brd)
if (!brd || brd->magic != DGAP_BOARD_MAGIC)
return;
- if (brd->intr_used && brd->irq)
- free_irq(brd->irq, brd);
+ dgap_free_irq(brd);
tasklet_kill(&brd->helper_tasklet);
@@ -816,6 +816,12 @@ static int dgap_request_irq(struct board_t *brd)
return 0;
}
+static void dgap_free_irq(struct board_t *brd)
+{
+ if (brd->intr_used && brd->irq)
+ free_irq(brd->irq, brd);
+}
+
static int dgap_firmware_load(struct pci_dev *pdev, int card_type)
{
struct board_t *brd = dgap_board[dgap_numboards - 1];