diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
| commit | 448cc2fb3a7b327823a9afd374808c37b8e6194f (patch) | |
| tree | a6d8ca3fa389980b47a495df2fb10892157c7dbc /drivers/media/pci/cx18/cx18-driver.c | |
| parent | 527bab0473f28236e4587c7870586275c1ef5516 (diff) | |
| parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
| download | linux-448cc2fb3a7b327823a9afd374808c37b8e6194f.tar.xz | |
Merge drm/drm-next into drm-intel-next
Sync up with drm-next to get v5.16-rc2.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/media/pci/cx18/cx18-driver.c')
| -rw-r--r-- | drivers/media/pci/cx18/cx18-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c index f2440eb38820..59497ba6bf1f 100644 --- a/drivers/media/pci/cx18/cx18-driver.c +++ b/drivers/media/pci/cx18/cx18-driver.c @@ -804,7 +804,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev, CX18_ERR("Can't enable device %d!\n", cx->instance); return -EIO; } - if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) { + if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) { CX18_ERR("No suitable DMA available, card %d\n", cx->instance); return -EIO; } |