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

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

Merge "drm/msm/dp: fix HDCP error handling" into msm-4.14

parents b863c80e f6f378d6

drivers/gpu/drm/msm/dp/dp_display.c

+3 −7
Original line number Diff line number Diff line
@@ -203,12 +203,6 @@ static void dp_display_notify_hdcp_status_cb(void *ptr, 
		queue_delayed_work(dp->wq, &dp->hdcp_cb_work, HZ/4);

}



static void dp_display_destroy_hdcp_workqueue(struct dp_display_private *dp)

{

	if (dp->wq)

		destroy_workqueue(dp->wq);

}



static void dp_display_update_hdcp_info(struct dp_display_private *dp)

{

	void *fd = NULL;
@@ -270,7 +264,6 @@ static void dp_display_deinitialize_hdcp(struct dp_display_private *dp) 
	}



	sde_dp_hdcp2p2_deinit(dp->hdcp.data);

	dp_display_destroy_hdcp_workqueue(dp);

	mutex_destroy(&dp->hdcp_mutex);

}
@@ -1976,6 +1969,9 @@ static int dp_display_remove(struct platform_device *pdev) 


	dp_display_deinit_sub_modules(dp);



	if (dp->wq)

		destroy_workqueue(dp->wq);



	platform_set_drvdata(pdev, NULL);

	devm_kfree(&pdev->dev, dp);