diff options
| author | Daeseok Youn <daeseok.youn@gmail.com> | 2014-09-23 00:22:36 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-24 06:39:25 (GMT) |
| commit | c74920124750e5270c689d8c892a1c4263e5a547 (patch) | |
| tree | e7d2e14107ca6f6239c576936e9593e6e3865f2b /drivers/staging/dgap | |
| parent | b23e487903ae1cf5d06c14fa719555dead0f5ae4 (diff) | |
| download | linux-c74920124750e5270c689d8c892a1c4263e5a547.tar.xz | |
staging: dgap: use dgap_release_remap() in dgap_cleanup_board()
Just simply use dgap_release_remap() in dgap_cleanup_board() for
releasing map memory.
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.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 637ea8a..d0be1ce 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -683,17 +683,7 @@ static void dgap_cleanup_board(struct board_t *brd) tasklet_kill(&brd->helper_tasklet); - if (brd->re_map_port) { - release_mem_region(brd->membase + 0x200000, 0x200000); - iounmap(brd->re_map_port); - brd->re_map_port = NULL; - } - - if (brd->re_map_membase) { - release_mem_region(brd->membase, 0x200000); - iounmap(brd->re_map_membase); - brd->re_map_membase = NULL; - } + dgap_release_remap(brd); /* Free all allocated channels structs */ for (i = 0; i < MAXPORTS ; i++) @@ -1023,10 +1013,15 @@ static int dgap_do_remap(struct board_t *brd) static void dgap_release_remap(struct board_t *brd) { - release_mem_region(brd->membase, 0x200000); - release_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000); - iounmap(brd->re_map_membase); - iounmap(brd->re_map_port); + if (brd->re_map_membase) { + release_mem_region(brd->membase, 0x200000); + iounmap(brd->re_map_membase); + } + + if (brd->re_map_port) { + release_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000); + iounmap(brd->re_map_port); + } } /***************************************************************************** * |