1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
--- a/linux/drivers/media/pci/cx23885/cx23885-core.c
+++ b/linux/drivers/media/pci/cx23885/cx23885-core.c
@@ -1989,9 +1989,9 @@ static int cx23885_initdev(struct pci_de
(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
+++ b/linux/drivers/media/pci/cx25821/cx25821-core.c
@@ -1315,7 +1315,8 @@ static int cx25821_initdev(struct pci_de
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
+++ b/linux/drivers/media/pci/cx88/cx88-alsa.c
@@ -890,9 +890,9 @@ static int snd_cx88_create(struct snd_ca
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
+++ b/linux/drivers/media/pci/cx88/cx88-mpeg.c
@@ -397,7 +397,8 @@ static int cx8802_init_common(struct cx8
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
+++ b/linux/drivers/media/pci/cx88/cx88-video.c
@@ -1332,9 +1332,9 @@ static int cx8800_initdev(struct 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))) {
+ 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/saa7134/saa7134-core.c
+++ b/linux/drivers/media/pci/saa7134/saa7134-core.c
@@ -948,9 +948,9 @@ static int saa7134_initdev(struct pci_de
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(pci_dev, DMA_BIT_MASK(32));
+ if (err) {
printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);
- err = -EIO;
goto fail1;
}
--- a/linux/drivers/media/pci/saa7164/saa7164-core.c
+++ b/linux/drivers/media/pci/saa7164/saa7164-core.c
@@ -1224,9 +1224,9 @@ static int saa7164_initdev(struct pci_de
pci_set_master(pci_dev);
/* TODO */
- 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_irq;
}
--- a/linux/drivers/media/pci/tw68/tw68-core.c
+++ b/linux/drivers/media/pci/tw68/tw68-core.c
@@ -256,9 +256,9 @@ static int tw68_initdev(struct pci_dev *
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;
}
|