diff options
author | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 12:53:42 +0300 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 12:53:42 +0300 |
commit | b812f646bb818ca0e1806072eb7f0006f3a65dde (patch) | |
tree | 3ba2134dcefd8127f5ad286e0fe1135588fbd0b3 /drivers/media/platform/rockchip/rga/rga.c | |
parent | a5fc012e6ee75a899173398573e77207542f588a (diff) | |
parent | e954d2c94d007afe487044ecfa48f2518643df0e (diff) | |
download | linux-b812f646bb818ca0e1806072eb7f0006f3a65dde.tar.xz |
Merge drm/drm-next into drm-misc-next
Christian needs a backmerge to avoid a merge conflict for amdgpu.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/media/platform/rockchip/rga/rga.c')
-rw-r--r-- | drivers/media/platform/rockchip/rga/rga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c index 4de5e8d2b261..3d3d1062e212 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -892,7 +892,7 @@ static int rga_probe(struct platform_device *pdev) } rga->dst_mmu_pages = (unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3); - if (rga->dst_mmu_pages) { + if (!rga->dst_mmu_pages) { ret = -ENOMEM; goto free_src_pages; } |