Merge "soc: qcom: wda: fix ssr cleanup" (21b67dc0) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/soc/qcom/qmi_rmnet.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -511,13 +511,15 @@ void qmi_rmnet_change_link(struct net_device dev, void port, void *tcm_pt)
		return;

		if (qmi_rmnet_setup_client(port, qmi, tcm) < 0) {
		if (!qmi_rmnet_has_client(qmi) &&
		/* retrieve qmi again as it could have been changed */
		qmi = (struct qmi_info *)rmnet_get_qmi_pt(port);
		if (qmi &&
		!qmi_rmnet_has_client(qmi) &&
		!qmi_rmnet_has_pending(qmi)) {
		kfree(qmi);
		rmnet_reset_qmi_pt(port);
		kfree(qmi);
		}
		}
		if (tcm->tcm_ifindex & FLAG_POWERSAVE_MASK) {
		} else if (tcm->tcm_ifindex & FLAG_POWERSAVE_MASK) {
		qmi_rmnet_work_init(port);
		rmnet_set_powersave_format(port);
		}
		@@ -525,7 +527,7 @@ void qmi_rmnet_change_link(struct net_device dev, void port, void *tcm_pt)
		case NLMSG_CLIENT_DELETE:
		if (!qmi)
		return;
		if (tcm->tcm_ifindex & FLAG_POWERSAVE_MASK) {
		if (tcm->tcm_handle == 0) { /* instance 0 */
		rmnet_clear_powersave_format(port);
		qmi_rmnet_work_exit(port);
		}