Merge "net: qrtr: mhi_dev: Handle mhi register error case" (2c112fe0) · Commits · e / devices / android_kernel_xiaomi_nabu

net/qrtr/mhi_dev.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -201,6 +201,7 @@ static int qrtr_mhi_dev_probe(struct platform_device *pdev)
		struct qrtr_mhi_dev_ep *qep;
		struct device_node *node;
		int rc;
		struct mhi_dev_client_cb_data cb_data;

		qep = devm_kzalloc(&pdev->dev, sizeof(*qep), GFP_KERNEL);
		if (!qep)
		@@ -227,8 +228,21 @@ static int qrtr_mhi_dev_probe(struct platform_device *pdev)
		*/
		rc = mhi_register_state_cb(qrtr_mhi_dev_state_cb, qep,
		QRTR_MHI_DEV_OUT);
		if (rc)
		if (rc == -EEXIST) {
		/**
		* MHI stack will return -EEXIST if mhi channel is already
		* opend by the host and will not invoke reqistered callback.
		* But future state change notification will inform through
		* registered callback.
		*/
		complete_all(&qep->out_tre);
		cb_data.user_data = (void *)qep;
		cb_data.channel = QRTR_MHI_DEV_OUT;
		cb_data.ctrl_info = MHI_STATE_CONNECTED;
		qrtr_mhi_dev_state_cb(&cb_data);
		} else if (rc) {
		return rc;
		}

		return 0;
		}