lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0278/1017] media: staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size
    Date
    From: Corentin Labbe <clabbe@baylibre.com>

    [ Upstream commit 241f5b67fb48def58643f279dfb8468bdd54b443 ]

    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: d4ae3689226e5 ("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>
    ---
    drivers/staging/media/zoran/zoran_card.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
    index f259585b0689..c578ef3c32f5 100644
    --- a/drivers/staging/media/zoran/zoran_card.c
    +++ b/drivers/staging/media/zoran/zoran_card.c
    @@ -1069,8 +1069,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) {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:10    [W:2.732 / U:0.788 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site