]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/gma500: Fix error return code in psb_driver_load()
authorJialin Zhang <zhangjialin11@huawei.com>
Mon, 30 Nov 2020 02:02:16 +0000 (10:02 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 09:26:19 +0000 (10:26 +0100)
[ Upstream commit 6926872ae24452d4f2176a3ba2dee659497de2c4 ]

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 5c49fd3aa0ab ("gma500: Add the core DRM files and headers")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201130020216.1906141-1-zhangjialin11@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/gma500/psb_drv.c

index 7005f8f69c683749a0e7493c001d929e7c1fa091..d414525eccf6da88937a0a10e165cdc7f15556b8 100644 (file)
@@ -313,6 +313,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
        if (ret)
                goto out_err;
 
+       ret = -ENOMEM;
+
        dev_priv->mmu = psb_mmu_driver_init(dev, 1, 0, 0);
        if (!dev_priv->mmu)
                goto out_err;