diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-04-30 00:53:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 08:29:42 -0700 |
| commit | e46a5e3ff06b70690d567bdc81faf6c1c32e742f (patch) | |
| tree | 0b6f8f40d6af73b90ff6b989fc88a0998f6b407b /drivers/char/moxa.c | |
| parent | d353eca4e0480fddcb088c4692e1edba0a82eac9 (diff) | |
| download | linux-e46a5e3ff06b70690d567bdc81faf6c1c32e742f.tar.gz linux-e46a5e3ff06b70690d567bdc81faf6c1c32e742f.tar.bz2 linux-e46a5e3ff06b70690d567bdc81faf6c1c32e742f.zip | |
Char: moxa, pci io space fixup
- request region before remapping pci io space
- use ioremap, iounmap istead of iomap interface, because we use
readX/writeX for accessing this space because of isa support
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/moxa.c')
| -rw-r--r-- | drivers/char/moxa.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 2701f7c9f938..f841b1f74bfc 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -290,10 +290,17 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev, } board = &moxa_boards[i]; - board->basemem = pci_iomap(pdev, 2, 0x4000); + + retval = pci_request_region(pdev, 2, "moxa-base"); + if (retval) { + dev_err(&pdev->dev, "can't request pci region 2\n"); + goto err; + } + + board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000); if (board->basemem == NULL) { dev_err(&pdev->dev, "can't remap io space 2\n"); - goto err; + goto err_reg; } board->boardType = board_type; @@ -315,6 +322,8 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, board); return (0); +err_reg: + pci_release_region(pdev, 2); err: return retval; } @@ -323,8 +332,9 @@ static void __devexit moxa_pci_remove(struct pci_dev *pdev) { struct moxa_board_conf *brd = pci_get_drvdata(pdev); - pci_iounmap(pdev, brd->basemem); + iounmap(brd->basemem); brd->basemem = NULL; + pci_release_region(pdev, 2); } static struct pci_driver moxa_pci_driver = { |