Commit 6347dc7f authored by Dan Carpenter's avatar Dan Carpenter Committed by Hans Verkuil
Browse files

media: rkvdec: Fix a NULL vs IS_ERR() bug in probe() 



The iommu_paging_domain_alloc() function doesn't return NULL on error it
returns error pointers.  Update the check and then set ->empty_domain to
NULL because the rest of the driver assumes it can be NULL.

Fixes: ff8c5622 ("media: rkvdec: Restore iommu addresses on errors")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Tested-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 8f5ae30d

drivers/media/platform/rockchip/rkvdec/rkvdec.c

+3 −1
Original line number Diff line number Diff line
@@ -1162,9 +1162,11 @@ static int rkvdec_probe(struct platform_device *pdev) 
	if (iommu_get_domain_for_dev(&pdev->dev)) {

		rkvdec->empty_domain = iommu_paging_domain_alloc(rkvdec->dev);



		if (!rkvdec->empty_domain)

		if (IS_ERR(rkvdec->empty_domain)) {

			rkvdec->empty_domain = NULL;

			dev_warn(rkvdec->dev, "cannot alloc new empty domain\n");

		}

	}



	vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));