Merge "diag: Set context properly while sending command responses" (1da237c9) · Commits · e / devices / android_kernel_sony_msm8998

drivers/char/diag/diagfwd.c

+20 −8

Original line number	Diff line number	Diff line
		@@ -259,11 +259,17 @@ static void pack_rsp_and_send(unsigned char *buf, int len,
		}

		if (info && info->peripheral_mask) {
		if (info->peripheral_mask == DIAG_CON_ALL \|\|
		(info->peripheral_mask & (1 << APPS_DATA)) \|\|
		(info->peripheral_mask & (1 << PERIPHERAL_MODEM))) {
		rsp_ctxt = SET_BUF_CTXT(APPS_DATA, TYPE_CMD, 1);
		} else {
		for (i = 0; i <= NUM_PERIPHERALS; i++) {
		if (info->peripheral_mask & (1 << i))
		break;
		}
		rsp_ctxt = SET_BUF_CTXT(i, TYPE_CMD, 1);
		}
		} else
		rsp_ctxt = driver->rsp_buf_ctxt;

		@@ -337,11 +343,17 @@ static void encode_rsp_and_send(unsigned char *buf, int len,
		}

		if (info && info->peripheral_mask) {
		if (info->peripheral_mask == DIAG_CON_ALL \|\|
		(info->peripheral_mask & (1 << APPS_DATA)) \|\|
		(info->peripheral_mask & (1 << PERIPHERAL_MODEM))) {
		rsp_ctxt = SET_BUF_CTXT(APPS_DATA, TYPE_CMD, 1);
		} else {
		for (i = 0; i <= NUM_PERIPHERALS; i++) {
		if (info->peripheral_mask & (1 << i))
		break;
		}
		rsp_ctxt = SET_BUF_CTXT(i, TYPE_CMD, 1);
		}
		} else
		rsp_ctxt = driver->rsp_buf_ctxt;