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

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

Merge "msm: vidc: Change misleading log"

parents a80f4be7 f4070cb5

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

+2 −1
Original line number Diff line number Diff line
@@ -2093,7 +2093,8 @@ static int msm_vdec_op_s_ctrl(struct v4l2_ctrl *ctrl) 


failed_open_done:

	if (rc)

		dprintk(VIDC_ERR, "Failed to set hal property for framesize\n");

		dprintk(VIDC_ERR, "Failed setting control: %x (%s)",

				ctrl->id, v4l2_ctrl_get_name(ctrl->id));

	return rc;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -2163,7 +2163,8 @@ static int msm_venc_op_s_ctrl(struct v4l2_ctrl *ctrl) 
	}

failed_open_done:

	if (rc)

		dprintk(VIDC_ERR, "Failed to set hal property\n");

		dprintk(VIDC_ERR, "Failed setting control: %x (%s)",

				ctrl->id, v4l2_ctrl_get_name(ctrl->id));

	return rc;

}