Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1575845

[PATCH 1/7] serial: exar: Fix mapping of port I/O resources

Show all headers | View raw

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>
---
 drivers/tty/serial/8250/8250_exar.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index e6b44a7..58469d9 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;
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] serial: exar: Fixes and cleanups Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
  [PATCH 5/7] serial: pci: Remove unused pci_boards entries Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
  [PATCH 7/7] serial: exar: Enable MSI support Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
    Re: [PATCH 7/7] serial: exar: Enable MSI support Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-02-08 00:30 +0100
  [PATCH 4/7] serial: exar: Move Commtech adapters to 8250_exar as well Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
    Re: [PATCH 4/7] serial: exar: Move Commtech adapters to 8250_exar as well Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-02-08 00:30 +0100
      Re: [PATCH 4/7] serial: exar: Move Commtech adapters to 8250_exar as  well Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-08 08:10 +0100
  [PATCH 1/7] serial: exar: Fix mapping of port I/O resources Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
    Re: [PATCH 1/7] serial: exar: Fix mapping of port I/O resources Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-02-07 23:50 +0100
  [PATCH 6/7] serial: exar: Move register defines from uapi header to consumer site Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
  [PATCH 3/7] serial: exar: Fix feature control register constants Jan Kiszka <jan.kiszka@siemens.com> - 2017-02-07 17:20 +0100
    Re: [PATCH 3/7] serial: exar: Fix feature control register constants Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-02-07 23:50 +0100

csiph-web