diff options
| author | Jonathan Woithe <jwoithe@atrad.com.au> | 2013-10-31 06:13:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-09 02:16:05 +0100 |
| commit | 6d4fa5bac71f7d83ba78d25a25df4c440a0ae69c (patch) | |
| tree | d1eba21a78e508cff65c71fa333b8e24dcaaa4fc /drivers/tty | |
| parent | serial: icom: dereference after free in load_code() (diff) | |
| download | linux-6d4fa5bac71f7d83ba78d25a25df4c440a0ae69c.tar.xz linux-6d4fa5bac71f7d83ba78d25a25df4c440a0ae69c.zip | |
serial: 8250: Fix initialisation of Quatech cards with the AMCC PCI chip
Fix the initialisation of older Quatech serial cards which are fitted with
the AMCC PCI Matchmaker interface chip.
Signed-off-by: Jonathan Woithe (jwoithe@just42.net)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 4697a514b80a..6063d1512429 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -1259,10 +1259,10 @@ static int pci_quatech_init(struct pci_dev *dev) unsigned long base = pci_resource_start(dev, 0); if (base) { u32 tmp; - outl(inl(base + 0x38), base + 0x38); + outl(inl(base + 0x38) | 0x00002000, base + 0x38); tmp = inl(base + 0x3c); outl(tmp | 0x01000000, base + 0x3c); - outl(tmp, base + 0x3c); + outl(tmp &= ~0x01000000, base + 0x3c); } } return 0; |