From 78a7966ec8f3f5d0d7b02fd01af04e960800342e Mon Sep 17 00:00:00 2001 From: Daeseok Youn Date: Fri, 13 Jun 2014 18:21:04 +0900 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/dgap/dgap.c | 10 ++++++++-- 1 file 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]; -- 2.11.0