armbian/linux-rockchip
0
0
Fork 0
mirror of https://github.com/armbian/linux-rockchip.git synced 2026-01-06 11:08:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

media: staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size

Browse Source 
[ Upstream commit 241f5b67fb ]

vb2_dma_contig_set_max_seg_size need to have a size in parameter and not
a DMA_BIT_MASK().
While fixing this issue, also fix error handling of all DMA size
setting.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: d4ae368922 ("media: zoran: device support only 32bit DMA address")
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Corentin Labbe
2021-12-14 17:16:29 +01:00
committed by Greg Kroah-Hartman
parent f622bd0758
commit c76188715d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/media/zoran/zoran_card.c
View File

@@ -1068,8 +1068,10 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
return -ENODEV;
vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
return err;
err = vb2_dma_contig_set_max_seg_size(&pdev->dev, U32_MAX);
if (err)
return err;
nr = zoran_num++;
if (nr >= BUZ_MAX) {