diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 20:11:34 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 20:11:34 -0600 |
| commit | 8c11642a50555e584774737f7c296f9aece310cf (patch) | |
| tree | 1ff8dfaf05479593ef2c50378a68dfc6aec495a5 /drivers/tty/serial/jsm/jsm_driver.c | |
| parent | 5d10302f46df1d9a85c34ea97f9b6c29e414482e (diff) | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
| download | blackbird-obmc-linux-8c11642a50555e584774737f7c296f9aece310cf.tar.gz blackbird-obmc-linux-8c11642a50555e584774737f7c296f9aece310cf.zip | |
Merge commit 'v3.0-rc7' into devicetree/next
Diffstat (limited to 'drivers/tty/serial/jsm/jsm_driver.c')
| -rw-r--r-- | drivers/tty/serial/jsm/jsm_driver.c | 2 |
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, " |
