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

Commit 1a47de6e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

various: fix pci_set_dma_mask return value checking 



pci_set_dma_mask returns a negative errno value, not a bool like
pci_dma_supported.  This of course was just a giant test for attention :)

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarJongman Heo <jongman.heo@samsung.com>
Tested-by: Jongman Heo <jongman.heo@samsung.com>	[pcnet32]
Acked-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Antti Palosaari <crope@iki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1a763615

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

+2 −2
Original line number Diff line number Diff line
@@ -1992,9 +1992,9 @@ static int cx23885_initdev(struct pci_dev *pci_dev, 
		(unsigned long long)pci_resource_start(pci_dev, 0));



	pci_set_master(pci_dev);

	if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {

	err = pci_set_dma_mask(pci_dev, 0xffffffff);

	if (err) {

		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);

		err = -EIO;

		goto fail_context;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -1319,7 +1319,8 @@ static int cx25821_initdev(struct pci_dev *pci_dev, 
		dev->pci_lat, (unsigned long long)dev->base_io_addr);



	pci_set_master(pci_dev);

	if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {

	err = pci_set_dma_mask(pci_dev, 0xffffffff);

	if (err) {

		pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);

		err = -EIO;

		goto fail_irq;

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

+2 −2
Original line number Diff line number Diff line
@@ -890,9 +890,9 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci, 
		return err;

	}



	if (!pci_set_dma_mask(pci,DMA_BIT_MASK(32))) {

	err = pci_set_dma_mask(pci,DMA_BIT_MASK(32));

	if (err) {

		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);

		err = -EIO;

		cx88_core_put(core, pci);

		return err;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ static int cx8802_init_common(struct cx8802_dev *dev) 
	if (pci_enable_device(dev->pci))

		return -EIO;

	pci_set_master(dev->pci);

	if (!pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32))) {

	err = pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32));

	if (err) {

		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);

		return -EIO;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -1314,9 +1314,9 @@ 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_set_dma_mask(pci_dev,DMA_BIT_MASK(32))) {

	err = pci_set_dma_mask(pci_dev,DMA_BIT_MASK(32));

	if (err) {

		printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);

		err = -EIO;

		goto fail_core;

	}

	dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);