From: Shuah Khan Date: Sat, 4 Nov 2017 02:01:57 +0000 (-0400) Subject: media: s5p-mfc: Remove firmware buf null check in s5p_mfc_load_firmware() X-Git-Tag: v5.15~9456^2~154 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a465321ac1bd90ffe2de030e29ef5738af046603;p=platform%2Fkernel%2Flinux-starfive.git media: s5p-mfc: Remove firmware buf null check in s5p_mfc_load_firmware() s5p_mfc_load_firmware() will not get called if fw_buf.virt allocation fails. The allocation happens very early on in the probe routine and probe fails if allocation fails. There is no need to check if it is null in s5p_mfc_load_firmware(). Remove the check. Signed-off-by: Shuah Khan Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 69ef9c2..46c9d67 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -75,11 +75,6 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) release_firmware(fw_blob); return -ENOMEM; } - if (!dev->fw_buf.virt) { - mfc_err("MFC firmware is not allocated\n"); - release_firmware(fw_blob); - return -EINVAL; - } memcpy(dev->fw_buf.virt, fw_blob->data, fw_blob->size); wmb(); release_firmware(fw_blob);