diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2017-02-08 17:09:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-10 15:12:38 +0100 |
| commit | 24572af4fb6ce0726dbe12b0286de11d25ff008b (patch) | |
| tree | cba34e0bcf18123a8f0f33a80da2b9c9a16c259c /drivers | |
| parent | 90afa5255f5c5ae67c869918e4c5f60b8580db70 (diff) | |
| download | linux-stable-24572af4fb6ce0726dbe12b0286de11d25ff008b.tar.gz linux-stable-24572af4fb6ce0726dbe12b0286de11d25ff008b.tar.bz2 linux-stable-24572af4fb6ce0726dbe12b0286de11d25ff008b.zip | |
serial: exar: Fix mapping of port I/O resources
pcim_iomap_table only returns the table of mapping, it does not perform
them. For that, we need to call pcim_iomap, but only if that mapping was
not done before.
Fixes: d0aeaa83f0b0 ("serial: exar: split out the exar code from 8250_pci")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/8250/8250_exar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index e6b44a75a5e0..58469d9d6515 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -72,6 +72,9 @@ static int default_setup(struct exar8250 *priv, struct pci_dev *pcidev, const struct exar8250_board *board = priv->board; unsigned int bar = 0; + if (!pcim_iomap_table(pcidev)[bar] && !pcim_iomap(pcidev, bar, 0)) + return -ENOMEM; + port->port.iotype = UPIO_MEM; port->port.mapbase = pci_resource_start(pcidev, bar) + offset; port->port.membase = pcim_iomap_table(pcidev)[bar] + offset; |