Merge branch 'vmwgfx-fixes-5.3' of git://people.freedesktop.org/~thomash/linux into drm-fixes (7610bb0b) · Commits · 戴 / test

drivers/gpu/drm/vmwgfx/vmwgfx_msg.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ static int vmw_recv_msg(struct rpc_channel channel, void *msg,
		!!(HIGH_WORD(ecx) & MESSAGE_STATUS_HB));
		if ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) == 0) {
		kfree(reply);

		reply = NULL;
		if ((HIGH_WORD(ebx) & MESSAGE_STATUS_CPT) != 0) {
		/* A checkpoint occurred. Retry. */
		continue;
		@@ -377,7 +377,7 @@ static int vmw_recv_msg(struct rpc_channel channel, void *msg,

		if ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) == 0) {
		kfree(reply);

		reply = NULL;
		if ((HIGH_WORD(ecx) & MESSAGE_STATUS_CPT) != 0) {
		/* A checkpoint occurred. Retry. */
		continue;
		@@ -389,10 +389,8 @@ static int vmw_recv_msg(struct rpc_channel channel, void *msg,
		break;
		}

		if (retries == RETRIES) {
		kfree(reply);
		if (!reply)
		return -EINVAL;
		}

		*msg_len = reply_len;
		*msg = reply;