rpmsg: glink: Free pending deferred work on remove (278bcb73) · Commits · 戴 / test

By just cancelling the deferred rx worker during GLINK instance teardown any pending deferred commands are leaked, so free them. Fixes: ("rpmsg: Introduce Qualcomm RPM glink driver") Cc: stable@vger.kernel.org Acked-by:

Chris Lew <clew@codeaurora.org> Tested-by:

Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by:

Bjorn Andersson <bjorn.andersson@linaro.org>

drivers/rpmsg/qcom_glink_native.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -1562,6 +1562,18 @@ static void qcom_glink_work(struct work_struct *work)
		}
		}

		static void qcom_glink_cancel_rx_work(struct qcom_glink *glink)
		{
		struct glink_defer_cmd *dcmd;
		struct glink_defer_cmd *tmp;

		/* cancel any pending deferred rx_work */
		cancel_work_sync(&glink->rx_work);

		list_for_each_entry_safe(dcmd, tmp, &glink->rx_queue, node)
		kfree(dcmd);
		}

		struct qcom_glink qcom_glink_native_probe(struct device dev,
		unsigned long features,
		struct qcom_glink_pipe *rx,
		@@ -1639,7 +1651,7 @@ void qcom_glink_native_remove(struct qcom_glink *glink)
		int ret;

		disable_irq(glink->irq);
		cancel_work_sync(&glink->rx_work);
		qcom_glink_cancel_rx_work(glink);

		ret = device_for_each_child(glink->dev, NULL, qcom_glink_remove_device);
		if (ret)

Admin message