Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5cd7fbd authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: wda: Fix invalid memory access"

parents 31b9ccc9 7d994739

drivers/soc/qcom/qmi_rmnet.c

+8 −0
Original line number Diff line number Diff line
@@ -481,6 +481,8 @@ qmi_rmnet_delete_client(void *port, struct qmi_info *qmi, struct tcmsg *tcm) 
		wda_qmi_client_exit(data);

		qmi->wda_client = NULL;

		qmi->wda_pending = NULL;

	} else {

		qmi_rmnet_flush_ps_wq();

	}



	__qmi_rmnet_delete_client(port, qmi, idx);
@@ -981,4 +983,10 @@ void qmi_rmnet_set_dl_msg_active(void *port) 
	qmi->dl_msg_active = true;

}

EXPORT_SYMBOL(qmi_rmnet_set_dl_msg_active);



void qmi_rmnet_flush_ps_wq(void)

{

	if (rmnet_ps_wq)

		flush_workqueue(rmnet_ps_wq);

}

#endif

drivers/soc/qcom/qmi_rmnet_i.h

+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ int 
wda_qmi_client_init(void *port, struct svc_info *psvc, struct qmi_info *qmi);

void wda_qmi_client_exit(void *wda_data);

int wda_set_powersave_mode(void *wda_data, u8 enable);

void qmi_rmnet_flush_ps_wq(void);

#else

static inline int

wda_qmi_client_init(void *port, struct svc_info *psvc, struct qmi_info *qmi)
@@ -184,5 +185,8 @@ static inline int wda_set_powersave_mode(void *wda_data, u8 enable) 
{

	return -EINVAL;

}

static inline void qmi_rmnet_flush_ps_wq(void)

{

}

#endif

#endif /*_RMNET_QMI_I_H*/