Merge "mhi: dev: satellite: synchronize subsystem connect and device assert" (bc0fdc5a) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/bus/mhi/devices/mhi_satellite.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -893,6 +893,8 @@ static int mhi_sat_rpmsg_probe(struct rpmsg_device *rpdev)
		if (!subsys)
		return -EINVAL;

		mutex_lock(&subsys->cntrl_mutex);

		MHI_SUBSYS_LOG("Received RPMSG probe\n");

		dev_set_drvdata(&rpdev->dev, subsys);
		@@ -905,6 +907,8 @@ static int mhi_sat_rpmsg_probe(struct rpmsg_device *rpdev)
		schedule_work(&sat_cntrl->connect_work);
		spin_unlock_irq(&subsys->cntrl_lock);

		mutex_unlock(&subsys->cntrl_mutex);

		return 0;
		}

		@@ -978,6 +982,13 @@ static void mhi_sat_dev_remove(struct mhi_device *mhi_dev)
		return;
		}

		/*
		* cancel any pending work as it is possible that work gets queued
		* when rpmsg probe comes in before controller is removed
		*/
		cancel_work_sync(&sat_cntrl->connect_work);
		cancel_work_sync(&sat_cntrl->process_work);

		/* remove address mappings */
		mutex_lock(&sat_cntrl->list_mutex);
		list_for_each_entry_safe(buf, tmp, &sat_cntrl->addr_map_list, node) {