Commit f546e121 authored Nov 10, 2015 by Christoph Hellwig Committed by Linus Torvalds Nov 10, 2015

saa7134: use pci_set_dma_mask insted of pci_dma_supported



This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Pawel Osciak <pawel@osciak.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 45fa9c03

drivers/media/pci/saa7134/saa7134-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -951,7 +951,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
		pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
		dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
		pci_set_master(pci_dev);
		if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
		if (!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
		pr_warn("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
		err = -EIO;
		goto fail1;

Admin message