openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Daeseok Youn 2014-06-13 18:21:04 +09:00 committed by Greg Kroah-Hartman
parent 08f53f61af
commit 78a7966ec8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/dgap/dgap.c
View File

@ -190,6 +190,7 @@ static void dgap_do_conc_load(struct board_t *brd, u8 *uaddr, int len);
#endif #endif
static int dgap_after_config_loaded(struct board_t *brd); static int dgap_after_config_loaded(struct board_t *brd);
static int dgap_request_irq(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_get_vpd(struct board_t *brd);
static void dgap_do_reset_board(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) if (!brd || brd->magic != DGAP_BOARD_MAGIC)
return; return;
if (brd->intr_used && brd->irq) dgap_free_irq(brd);
free_irq(brd->irq, brd);
tasklet_kill(&brd->helper_tasklet); tasklet_kill(&brd->helper_tasklet);
@ -816,6 +816,12 @@ static int dgap_request_irq(struct board_t *brd)
return 0; 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) static int dgap_firmware_load(struct pci_dev *pdev, int card_type)
{ {
struct board_t *brd = dgap_board[dgap_numboards - 1]; struct board_t *brd = dgap_board[dgap_numboards - 1];