Skip to content

Commit

Permalink
Merge pull request torvalds#119 from tkurbad/linux-4.4-fixes
Browse files Browse the repository at this point in the history
Compatibility fixes for kernel version 4.4.x
  • Loading branch information
ljalves committed Mar 1, 2016
2 parents 88df4e2 + 5f7a313 commit c9626a9
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/media/i2c/adp1653.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ static int adp1653_of_init(struct i2c_client *client,

of_node_put(child);

pd->enable_gpio = devm_gpiod_get(&client->dev, "enable");
pd->enable_gpio = devm_gpiod_get(&client->dev, "enable", GPIOD_ASIS);
if (!pd->enable_gpio) {
dev_err(&client->dev, "Error getting GPIO\n");
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/cx23885/cx23885-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1990,7 +1990,7 @@ 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_dma_supported(pci_dev, 0xffffffff)) {
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, 0xffffffff)) {
printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
err = -EIO;
goto fail_context;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/cx25821/cx25821-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, 0xffffffff)) {
pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
err = -EIO;
goto fail_irq;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/cx88/cx88-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
return err;
}

if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
if (!dma_supported(pci == NULL ? NULL : &pci->dev, DMA_BIT_MASK(32))) {
dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
err = -EIO;
cx88_core_put(core, pci);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/cx88/cx88-mpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
if (pci_enable_device(dev->pci))
return -EIO;
pci_set_master(dev->pci);
if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
if (!dma_supported(dev->pci == NULL ? NULL : &dev->pci->dev, DMA_BIT_MASK(32))) {
printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
return -EIO;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/cx88/cx88-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ 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_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, DMA_BIT_MASK(32))) {
printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
err = -EIO;
goto fail_core;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
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))) {
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, DMA_BIT_MASK(32))) {
pr_warn("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
err = -EIO;
goto fail1;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/saa7164/saa7164-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,

pci_set_master(pci_dev);
/* TODO */
if (!pci_dma_supported(pci_dev, 0xffffffff)) {
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, 0xffffffff)) {
printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
err = -EIO;
goto fail_irq;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/pci/tw68/tw68-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int tw68_initdev(struct pci_dev *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))) {
if (!dma_supported(pci_dev == NULL ? NULL : &pci_dev->dev, DMA_BIT_MASK(32))) {
pr_info("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
err = -EIO;
goto fail1;
Expand Down

0 comments on commit c9626a9

Please sign in to comment.