Merge "msm: vidc: Load firmware early only if early-fw-load is true" (22248a8f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -468,7 +468,6 @@ static void fw_load_handler(struct work_struct *work)
		}
		dprintk(VIDC_DBG, "%s - firmware loaded successfully\n", __func__);

		msm_vidc_suspend(core->id);
		exit:
		kfree(handler);
		}
		@@ -610,6 +609,7 @@ static int msm_vidc_probe(struct platform_device *pdev)
		core, vidc_driver->debugfs_root);
		pdev->dev.platform_data = core;

		if (core->resources.early_fw_load)
		load_firmware(core);

		return rc;