Merge "diag: Release diag wakesource on socket error" (6654963b) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/char/diag/diagfwd_socket.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -597,12 +597,14 @@ static void socket_read_work_fn(struct work_struct *work)
		struct diag_socket_info,
		read_work);

		if (!info)
		if (!info) {
		diag_ws_release();
		return;

		}
		mutex_lock(&info->socket_info_mutex);
		if (!info->hdl \|\| !info->hdl->sk) {
		mutex_unlock(&info->socket_info_mutex);
		diag_ws_release();
		return;
		}
		err = sock_error(info->hdl->sk);
		@@ -611,6 +613,7 @@ static void socket_read_work_fn(struct work_struct *work)
		socket_close_channel(info);
		if (info->port_type == PORT_TYPE_SERVER)
		socket_init_work_fn(&info->init_work);
		diag_ws_release();
		return;
		}