Commit 7cd3e9db authored Mar 23, 2017 by Jan Kiszka Committed by Greg Kroah-Hartman Mar 31, 2017

serial: 8250_lpss: Unconditionally set PCI master for Quark



MSI needs it as well.

Should have no practical impact, though, as DMA is always available on
the Quark. But given the few users of pci_alloc_irq_vectors so far, this
incorrect pattern may spread otherwise.

Fixes: 3f3a4695 ("serial: 8250_lpss: set PCI master only for private DMA")
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>

parent 2ed2b862

drivers/tty/serial/8250/8250_lpss.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,6 @@ static void qrk_serial_setup_dma(struct lpss8250 lpss, struct uart_port port)
		if (ret)
		return;

		pci_set_master(pdev);
		pci_try_set_mwi(pdev);

		/* Special DMA address for UART */
		@@ -216,6 +215,8 @@ static int qrk_serial_setup(struct lpss8250 lpss, struct uart_port port)
		struct pci_dev *pdev = to_pci_dev(port->dev);
		int ret;

		pci_set_master(pdev);

		ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
		if (ret < 0)
		return ret;