aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx25821/cx25821-core.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-11-02 03:16:10 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2015-11-02 03:34:05 +1100
commit59b762f4494cdb9b51437096445550f023486e7f (patch)
tree09c4beceaa66b2039c69e16ddd2cb8c831714bde /drivers/media/pci/cx25821/cx25821-core.c
parent16d21a21200624ca29f34cbc879ddd7eaa39938b (diff)
parentfb3e4d832b0c075c331501564f5cc1d0be7eb257 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821-core.c')
-rw-r--r--drivers/media/pci/cx25821/cx25821-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 559f8293c53a..dbc695f32760 100644
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -1319,7 +1319,7 @@ 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_dma_supported(pci_dev, 0xffffffff)) {
+ if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {
pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
err = -EIO;
goto fail_irq;