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

Commit e1fbc617 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: remove mst connector properly during uninstall"

parents f980e34a 28fcff9e

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

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static ssize_t dp_debug_write_edid_modes_mst(struct file *file, 
{

	struct dp_debug_private *debug = file->private_data;

	struct dp_mst_connector *mst_connector;

	char buf[SZ_32];

	char buf[SZ_512];

	char *read_buf;

	size_t len = 0;
@@ -394,7 +394,7 @@ static ssize_t dp_debug_write_edid_modes_mst(struct file *file, 
	if (*ppos)

		goto end;



	len = min_t(size_t, count, SZ_32 - 1);

	len = min_t(size_t, count, SZ_512 - 1);

	if (copy_from_user(buf, user_buff, len))

		goto end;

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

+1 −1
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ static int dp_display_mst_connector_uninstall(struct dp_display *dp_display, 


	list_for_each_entry_safe(con_to_remove, temp_con,

			&dp->debug->dp_mst_connector_list.list, list) {

		if (con_to_remove->con_id == connector->base.id) {

		if (con_to_remove->conn == connector) {

			list_del(&con_to_remove->list);

			kfree(con_to_remove);

		}