]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bus: fsl-mc: fix error return code in fsl_mc_object_allocate()
authorZhang Changzhong <zhangchangzhong@huawei.com>
Fri, 4 Dec 2020 08:02:47 +0000 (16:02 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:51:23 +0000 (11:51 +0100)
[ Upstream commit 3d70fb03711c37bc64e8e9aea5830f498835f6bf ]

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

Fixes: 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Acked-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Link: https://lore.kernel.org/r/1607068967-31991-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/bus/fsl-mc/fsl-mc-allocator.c

index cc7bb900f5249860658a839ae1a79383c018c791..95672306d3714f81f99c22d3af3a9dbdedcb67fb 100644 (file)
@@ -292,8 +292,10 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,
                goto error;
 
        mc_adev = resource->data;
-       if (!mc_adev)
+       if (!mc_adev) {
+               error = -EINVAL;
                goto error;
+       }
 
        mc_adev->consumer_link = device_link_add(&mc_dev->dev,
                                                 &mc_adev->dev,