Merge "qdss_bridge: fix NULL usb_ch of usb_qdss_close" (1ea919cd) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/qdss_bridge.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -504,7 +504,6 @@ static int mhi_ch_open(struct qdss_bridge_drvdata *drvdata)
		spin_unlock_bh(&drvdata->lock);
		return -ERESTARTSYS;
		}
		drvdata->opened = ENABLE;
		spin_unlock_bh(&drvdata->lock);

		ret = mhi_prepare_for_transfer(drvdata->mhi_dev);
		@@ -516,7 +515,6 @@ static int mhi_ch_open(struct qdss_bridge_drvdata *drvdata)
		return 0;
		err:
		spin_lock_bh(&drvdata->lock);
		drvdata->opened = DISABLE;
		spin_unlock_bh(&drvdata->lock);
		return ret;
		}
		@@ -543,9 +541,9 @@ static void qdss_bridge_open_work_fn(struct work_struct *work)
		goto err;
		}

		drvdata->opened = ENABLE;
		return;
		err:
		drvdata->opened = DISABLE;
		mhi_unprepare_from_transfer(drvdata->mhi_dev);
		mhi_ch_close(drvdata);
		err_open: