Merge "disp: msm: dp: Fix incorrect NULL pointer check" (1864600a) · Commits · e / devices / android_kernel_fairphone_FP4

msm/dp/dp_audio.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ static struct dp_audio_private dp_audio_get_data(struct platform_device pdev)
		}

		dp_audio = ext_data->intf_data;
		if (!ext_data) {
		if (!dp_audio) {
		DP_ERR("invalid intf data\n");
		return ERR_PTR(-EINVAL);
		}
		@@ -424,6 +424,11 @@ static int dp_audio_get_edid_blk(struct platform_device *pdev,
		struct dp_audio_private *audio;
		struct sde_edid_ctrl *edid;

		if (!blk) {
		DP_ERR("invalid input\n");
		return -EINVAL;
		}

		audio = dp_audio_get_data(pdev);
		if (IS_ERR(audio)) {
		rc = PTR_ERR(audio);