Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

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

cx88: 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: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f546e121

drivers/media/pci/cx88/cx88-alsa.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card card, struct pci_dev pci,
		return err;
		}

		if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
		if (!pci_set_dma_mask(pci,DMA_BIT_MASK(32))) {
		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
		err = -EIO;
		cx88_core_put(core, pci);

drivers/media/pci/cx88/cx88-mpeg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
		if (pci_enable_device(dev->pci))
		return -EIO;
		pci_set_master(dev->pci);
		if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
		if (!pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32))) {
		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
		return -EIO;
		}

drivers/media/pci/cx88/cx88-video.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1314,7 +1314,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
		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))) {
		printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
		err = -EIO;
		goto fail_core;