Merge "disp: msm: sde: fix hdr meta data property handling" (a29613f7) · Commits · e / devices / android_kernel_fairphone_FP4

msm/sde/sde_connector.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1262,12 +1262,6 @@ static int _sde_connector_set_ext_hdr_info(

		connector = &c_conn->base;

		if (!connector->hdr_supported) {
		SDE_ERROR_CONN(c_conn, "sink doesn't support HDR\n");
		rc = -ENOTSUPP;
		goto end;
		}

		memset(&c_state->hdr_meta, 0, sizeof(c_state->hdr_meta));

		if (!usr_ptr) {
		@@ -1275,6 +1269,12 @@ static int _sde_connector_set_ext_hdr_info(
		goto end;
		}

		if (!connector->hdr_supported) {
		SDE_ERROR_CONN(c_conn, "sink doesn't support HDR\n");
		rc = -ENOTSUPP;
		goto end;
		}

		if (copy_from_user(&c_state->hdr_meta,
		(void __user *)usr_ptr,
		sizeof(*hdr_meta))) {