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

Commit bff6b51c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Use correct bridge index while sending data"

parents 88701f0b f604d65d

drivers/char/diag/diagchar_core.c

+5 −5
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static int diag_send_raw_data_remote(int proc, void *buf, int len, 
					(void *)driver->hdlc_encode_buf);



send_data:

	err = diagfwd_bridge_write(proc, driver->hdlc_encode_buf,

	err = diagfwd_bridge_write(bridge_index, driver->hdlc_encode_buf,

				   driver->hdlc_encode_buf_len);

	if (err) {

		pr_err_ratelimited("diag: Error writing Callback packet to proc: %d, err: %d\n",
@@ -2570,7 +2570,7 @@ static int diag_user_process_raw_data(const char __user *buf, int len) 
		}

	}

	if (remote_proc) {

		ret = diag_send_raw_data_remote(remote_proc - 1,

		ret = diag_send_raw_data_remote(remote_proc,

				(void *)(user_space_data + token_offset),

				len, USER_SPACE_RAW_DATA);

		if (ret) {
@@ -3424,13 +3424,13 @@ static int __init diagchar_init(void) 
	ret = diag_masks_init();

	if (ret)

		goto fail;

	ret = diag_mux_init();

	ret = diag_remote_init();

	if (ret)

		goto fail;

	ret = diagfwd_init();

	ret = diag_mux_init();

	if (ret)

		goto fail;

	ret = diag_remote_init();

	ret = diagfwd_init();

	if (ret)

		goto fail;

	ret = diagfwd_bridge_init();

drivers/char/diag/diagfwd_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int diagfwd_bridge_mux_write_done(unsigned char *buf, int len, 


	if (id < 0 || id >= NUM_REMOTE_DEV)

		return -EINVAL;

	ch = &bridge_info[id];

	ch = &bridge_info[buf_ctx];

	if (ch->dev_ops && ch->dev_ops->fwd_complete)

		ch->dev_ops->fwd_complete(ch->ctxt, buf, len, 0);

	return 0;