leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Char: moxa, pci io space fixup

Browse Source 
- 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>
This commit is contained in:
Jiri Slaby 2008-04-30 00:53:37 -07:00 committed by Linus Torvalds
parent d353eca4e0
commit e46a5e3ff0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/char/moxa.c
View File

@ -290,10 +290,17 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
} }
board = &moxa_boards[i]; 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) { if (board->basemem == NULL) {
dev_err(&pdev->dev, "can't remap io space 2\n"); dev_err(&pdev->dev, "can't remap io space 2\n");
goto err; goto err_reg;
} }
board->boardType = board_type; board->boardType = board_type;
@ -315,6 +322,8 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, board); pci_set_drvdata(pdev, board);
return (0); return (0);
err_reg:
pci_release_region(pdev, 2);
err: err:
return retval; 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); struct moxa_board_conf *brd = pci_get_drvdata(pdev);
pci_iounmap(pdev, brd->basemem); iounmap(brd->basemem);
brd->basemem = NULL; brd->basemem = NULL;
pci_release_region(pdev, 2);
} }
static struct pci_driver moxa_pci_driver = { static struct pci_driver moxa_pci_driver = {