--- a/linux/drivers/media/pci/cx23885/cx23885-core.c	2015-04-09 05:45:08.000000000 +0200
+++ b/linux/drivers/media/pci/cx23885/cx23885-core.c	2016-01-05 09:34:16.332827068 +0100
@@ -1990,9 +1990,9 @@
 		(unsigned long long)pci_resource_start(pci_dev, 0));
 
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(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;
 	}
 
--- a/linux/drivers/media/pci/cx25821/cx25821-core.c	2014-12-24 05:45:09.000000000 +0100
+++ b/linux/drivers/media/pci/cx25821/cx25821-core.c	2016-01-05 09:32:09.011976792 +0100
@@ -1319,9 +1319,9 @@
 		dev->pci_lat, (unsigned long long)dev->base_io_addr);
 
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(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;
 	}
 
--- a/linux/drivers/media/pci/cx88/cx88-alsa.c	2014-11-04 05:45:07.000000000 +0100
+++ b/linux/drivers/media/pci/cx88/cx88-alsa.c	2016-01-05 09:32:09.011976792 +0100
@@ -890,9 +890,9 @@
 		return err;
 	}
 
-	if (!pci_dma_supported(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;
 	}
--- a/linux/drivers/media/pci/cx88/cx88-mpeg.c	2015-05-02 05:45:27.000000000 +0200
+++ b/linux/drivers/media/pci/cx88/cx88-mpeg.c	2016-01-05 09:32:09.011976792 +0100
@@ -393,7 +393,8 @@
 	if (pci_enable_device(dev->pci))
 		return -EIO;
 	pci_set_master(dev->pci);
-	if (!pci_dma_supported(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;
 	}
--- a/linux/drivers/media/pci/cx88/cx88-video.c	2015-05-02 05:45:27.000000000 +0200
+++ b/linux/drivers/media/pci/cx88/cx88-video.c	2016-01-05 09:32:09.011976792 +0100
@@ -1311,9 +1311,9 @@
 	       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))) {
+	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);
--- a/linux/drivers/media/pci/tw68/tw68-core.c	2014-11-26 05:45:10.000000000 +0100
+++ b/linux/drivers/media/pci/tw68/tw68-core.c	2016-01-05 09:32:09.015976819 +0100
@@ -256,9 +256,9 @@
 		dev->name, pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
 		dev->pci_lat, (u64)pci_resource_start(pci_dev, 0));
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
+	err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));
+	if (err) {
 		pr_info("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
-		err = -EIO;
 		goto fail1;
 	}
 
--- a/linux/drivers/media/pci/saa7164/saa7164-core.c~	2015-05-02 05:45:27.000000000 +0200
+++ b/linux/drivers/media/pci/saa7164/saa7164-core.c	2016-04-03 12:29:18.041264469 +0200
@@ -1226,9 +1226,9 @@
 
 	pci_set_master(pci_dev);
 	/* TODO */
-	if (!pci_dma_supported(pci_dev, 0xffffffff)) {
+	err = pci_set_dma_mask(pci_dev,DMA_BIT_MASK(32));
+	if (err) {
 		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
-		err = -EIO;
 		goto fail_irq;
 	}
 
--- a/linux/drivers/media/pci/saa7134/saa7134-core.c~	2014-11-26 05:45:10.000000000 +0100
+++ b/linux/drivers/media/pci/saa7134/saa7134-core.c	2016-04-03 13:04:24.131105208 +0200
@@ -948,9 +948,9 @@
 	       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))) {
+	err = pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32));
+	if (err) {
 		printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);
-		err = -EIO;
 		goto fail1;
 	}