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

Commit 9a1e3497 authored by Sreelakshmi Gownipalli's avatar Sreelakshmi Gownipalli Committed by Gerrit - the friendly Code Review server
Browse files

diag: Pass correct device id from bridge to mhi 



Pass the bridge id from diag bridge to mhi instead of
mux id.

Change-Id: I1fc77b208a89f70a9f0a8307f186c299e99f8ed2
Signed-off-by: default avatarSreelakshmi Gownipalli <sgownipa@codeaurora.org>
parent 92537f8c

drivers/char/diag/diagfwd_bridge.c

+5 −3
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ int diagfwd_bridge_close(int id) 
	if (id < 0 || id >= NUM_REMOTE_DEV)

		return -EINVAL;

	if (bridge_info[id].dev_ops && bridge_info[id].dev_ops->close)

		return bridge_info[id].dev_ops->close(id, bridge_info[id].ctxt);

		return bridge_info[id].dev_ops->close(bridge_info[id].id,

						bridge_info[id].ctxt);

	return 0;

}
@@ -299,7 +300,8 @@ int diagfwd_bridge_write(int id, unsigned char *buf, int len) 
	if (id < 0 || id >= NUM_REMOTE_DEV)

		return -EINVAL;

	if (bridge_info[id].dev_ops && bridge_info[id].dev_ops->write) {

		return bridge_info[id].dev_ops->write(id, bridge_info[id].ctxt,

		return bridge_info[id].dev_ops->write(bridge_info[id].id,

							bridge_info[id].ctxt,

							buf, len, 0);

	}

	return 0;

drivers/char/diag/diagfwd_mhi.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int get_id_from_token(int token) 
	for (dev_idx = 0; dev_idx < NUM_MHI_DEV; dev_idx++)

		for (ch_idx = 0; ch_idx < NUM_MHI_CHAN; ch_idx++)

			if (diag_mhi[dev_idx][ch_idx].dev_id == token)

				return ch_idx;

				return dev_idx;



	return -EINVAL;

}