Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a0d57f0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: remove error message for probe defer handling"

parents 65c8197e c4949de3

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2958,7 +2958,7 @@ int sde_rotator_core_init(struct sde_rot_mgr **pmgr, 
	*pmgr = mgr;

	ret = sde_rotator_footswitch_ctrl(mgr, true);

	if (ret) {

		SDEROT_ERR("res_init failed %d\n", ret);

		SDEROT_INFO("res_init failed %d, use probe defer\n", ret);

		ret = -EPROBE_DEFER;

		goto error_fs_en_fail;

	}

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+4 −1
Original line number Diff line number Diff line
@@ -3291,6 +3291,9 @@ static int sde_rotator_probe(struct platform_device *pdev) 


	ret = sde_rotator_core_init(&rot_dev->mgr, pdev);

	if (ret < 0) {

		if (ret == -EPROBE_DEFER)

			SDEDEV_INFO(&pdev->dev, "probe defer for core init\n");

		else

			SDEDEV_ERR(&pdev->dev, "fail init core %d\n", ret);

		goto error_rotator_core_init;

	}

drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c

+2 −1
Original line number Diff line number Diff line
@@ -519,7 +519,8 @@ int sde_smmu_probe(struct platform_device *pdev) 
	char name[MAX_CLIENT_NAME_LEN];



	if (!mdata) {

		SDEROT_ERR("probe failed as mdata is not initialized\n");

		SDEROT_INFO(

			"probe failed as mdata is not initializedi, probe defer\n");

		return -EPROBE_DEFER;

	}