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

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

Merge "diag: Switch to correct logging mode after mdlog exit"

parents a6a70b92 3f26e341

drivers/char/diag/diagchar_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1615,7 +1615,8 @@ static int diag_md_session_check(int proc, int curr_mode, int req_mode, 
		*change_mode = 1;

		return 0;

	} else if ((req_mode == DIAG_USB_MODE || req_mode == DIAG_PCIE_MODE)

		&& curr_mode == DIAG_MEMORY_DEVICE_MODE) {

		&& (curr_mode == DIAG_MEMORY_DEVICE_MODE ||

			curr_mode == DIAG_MULTI_MODE)) {

		mutex_lock(&driver->md_session_lock);

		if (driver->md_session_mode[proc] == DIAG_MD_NONE

		    && driver->md_session_mask[proc] == 0 &&