summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/jsm/jsm_driver.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-06-30 12:43:56 +0400
committerJames Morris <jmorris@namei.org>2011-06-30 12:43:56 +0400
commit5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch)
tree9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /drivers/tty/serial/jsm/jsm_driver.c
parent0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff)
parentc017d0d1351f916c0ced3f358afc491fdcf490b4 (diff)
downloadlinux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.xz
Merge branch 'linus' into next
Diffstat (limited to 'drivers/tty/serial/jsm/jsm_driver.c')
-rw-r--r--drivers/tty/serial/jsm/jsm_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 18f548449c63..96da17868cf3 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -125,7 +125,7 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
brd->bd_uart_offset = 0x200;
brd->bd_dividend = 921600;
- brd->re_map_membase = ioremap(brd->membase, 0x1000);
+ brd->re_map_membase = ioremap(brd->membase, pci_resource_len(pdev, 0));
if (!brd->re_map_membase) {
dev_err(&pdev->dev,
"card has no PCI Memory resources, "