Skip to content

Commit c9626a9

Browse files
committed
Merge pull request torvalds#119 from tkurbad/linux-4.4-fixes
Compatibility fixes for kernel version 4.4.x
2 parents 88df4e2 + 5f7a313 commit c9626a9

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

drivers/media/i2c/adp1653.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static int adp1653_of_init(struct i2c_client *client,
465465

466466
of_node_put(child);
467467

468-
pd->enable_gpio = devm_gpiod_get(&client->dev, "enable");
468+
pd->enable_gpio = devm_gpiod_get(&client->dev, "enable", GPIOD_ASIS);
469469
if (!pd->enable_gpio) {
470470
dev_err(&client->dev, "Error getting GPIO\n");
471471
return -EINVAL;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
19901990
(unsigned long long)pci_resource_start(pci_dev, 0));
19911991

19921992
pci_set_master(pci_dev);
1993-
if (!pci_dma_supported(pci_dev, 0xffffffff)) {
1993+
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, 0xffffffff)) {
19941994
printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
19951995
err = -EIO;
19961996
goto fail_context;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ static int cx25821_initdev(struct pci_dev *pci_dev,
13191319
dev->pci_lat, (unsigned long long)dev->base_io_addr);
13201320

13211321
pci_set_master(pci_dev);
1322-
if (!pci_dma_supported(pci_dev, 0xffffffff)) {
1322+
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, 0xffffffff)) {
13231323
pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
13241324
err = -EIO;
13251325
goto fail_irq;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
890890
return err;
891891
}
892892

893-
if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
893+
if (!dma_supported(pci == NULL ? NULL : &pci->dev, DMA_BIT_MASK(32))) {
894894
dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
895895
err = -EIO;
896896
cx88_core_put(core, pci);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
393393
if (pci_enable_device(dev->pci))
394394
return -EIO;
395395
pci_set_master(dev->pci);
396-
if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
396+
if (!dma_supported(dev->pci == NULL ? NULL : &dev->pci->dev, DMA_BIT_MASK(32))) {
397397
printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
398398
return -EIO;
399399
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
13111311
dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
13121312

13131313
pci_set_master(pci_dev);
1314-
if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
1314+
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, DMA_BIT_MASK(32))) {
13151315
printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
13161316
err = -EIO;
13171317
goto fail_core;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
949949
pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
950950
dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
951951
pci_set_master(pci_dev);
952-
if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
952+
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, DMA_BIT_MASK(32))) {
953953
pr_warn("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
954954
err = -EIO;
955955
goto fail1;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
12641264

12651265
pci_set_master(pci_dev);
12661266
/* TODO */
1267-
if (!pci_dma_supported(pci_dev, 0xffffffff)) {
1267+
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, 0xffffffff)) {
12681268
printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
12691269
err = -EIO;
12701270
goto fail_irq;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static int tw68_initdev(struct pci_dev *pci_dev,
256256
dev->name, pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
257257
dev->pci_lat, (u64)pci_resource_start(pci_dev, 0));
258258
pci_set_master(pci_dev);
259-
if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
259+
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, DMA_BIT_MASK(32))) {
260260
pr_info("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
261261
err = -EIO;
262262
goto fail1;

0 commit comments

Comments
 (0)