Merge "msm: ipa: nullify mailbox struct after freeing" (efb51708) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/platform/msm/ipa/ipa_v3/ipa.c

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7023,7 +7023,9 @@ void ipa_pc_qmp_enable(void)
	ret = PTR_ERR(ipa3_ctx->mbox);		ret = PTR_ERR(ipa3_ctx->mbox);
	if (ret != -EPROBE_DEFER)		if (ret != -EPROBE_DEFER)
	IPAERR("mailbox channel request failed, ret=%d\n", ret);		IPAERR("mailbox channel request failed, ret=%d\n", ret);
	goto cleanup;
			ipa3_ctx->mbox = NULL;
			return;
	}		}

	/* prepare the QMP packet to send */		/* prepare the QMP packet to send */
	@@ -7038,8 +7040,10 @@ void ipa_pc_qmp_enable(void)
	}		}

	cleanup:		cleanup:
	ipa3_ctx->mbox = NULL;		if (ipa3_ctx->mbox) {
	mbox_free_channel(ipa3_ctx->mbox);		mbox_free_channel(ipa3_ctx->mbox);
			ipa3_ctx->mbox = NULL;
			}
	}		}

	/**************************************************************		/**************************************************************