diff options
| author | Greg Kroah-Hartman | 2014-02-13 10:06:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-13 10:06:34 -0800 |
| commit | 5669b705024659e982472cef22f7fc3c3a09cba2 (patch) | |
| tree | d04f516fdf65a781434d13cc4e61b78d7416e40e /drivers/tty/serial/8250/8250_pci.c | |
| parent | 05202872ca98f8ea61943a9b530417c5503b816f (diff) | |
| parent | 45a7bd635930baa960b6817674c64bdfb8f39570 (diff) | |
Merge branch 'tty-linus' into tty-next
We want the tty core fixes in here as well, because other patches depend
on them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_pci.c')
| -rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 50228eed3b6f..0ff3e3624d4c 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -783,7 +783,8 @@ static int pci_netmos_9900_setup(struct serial_private *priv, { unsigned int bar; - if ((priv->dev->subsystem_device & 0xff00) == 0x3000) { + if ((priv->dev->device != PCI_DEVICE_ID_NETMOS_9865) && + (priv->dev->subsystem_device & 0xff00) == 0x3000) { /* netmos apparently orders BARs by datasheet layout, so serial * ports get BARs 0 and 3 (or 1 and 4 for memmapped) */ |