projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24e6fd4
)
Char: sx, fix io unmapping
author
Jiri Slaby
<
[email protected]
>
Mon, 13 Oct 2008 09:34:18 +0000
(10:34 +0100)
committer
Linus Torvalds
<
[email protected]
>
Mon, 13 Oct 2008 16:51:39 +0000
(09:51 -0700)
board->base is increased for CF cards after mapping. Use board->base2
for unmapping the region, since it holds the original/correct address.
Signed-off-by: Jiri Slaby <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Alan Cox <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/char/sx.c
patch
|
blob
|
history
diff --git
a/drivers/char/sx.c
b/drivers/char/sx.c
index c385206f9db540caa925d615be1c1d4d566482f4..5b8d7a1aa3e64853c21eb524339123a81bd31f3b 100644
(file)
--- a/
drivers/char/sx.c
+++ b/
drivers/char/sx.c
@@
-2504,7
+2504,7
@@
static void __devexit sx_remove_card(struct sx_board *board,
del_timer(&board->timer);
if (pdev) {
#ifdef CONFIG_PCI
- pci_iounmap(pdev, board->base);
+ pci_iounmap(pdev, board->base
2
);
pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2);
#endif
} else {
@@
-2703,7
+2703,7
@@
static int __devinit sx_pci_probe(struct pci_dev *pdev,
return 0;
err_unmap:
- pci_iounmap(pdev, board->base);
+ pci_iounmap(pdev, board->base
2
);
err_reg:
pci_release_region(pdev, reg);
err_flag: