Merge "diag: dci: Fix possible race condition during SSR" (490d7b38) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/char/diag/diag_dci.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2897,7 +2897,6 @@ int diag_dci_deinit_client(struct diag_dci_client_tbl *entry)
		diag_update_userspace_clients(DCI_LOG_MASKS_TYPE);
		ret = dci_ops_tbl[token].send_log_mask(token);
		if (ret != DIAG_DCI_NO_ERROR) {
		mutex_unlock(&driver->dci_mutex);
		return ret;
		}
		kfree(entry->dci_event_mask);
		@@ -2906,7 +2905,6 @@ int diag_dci_deinit_client(struct diag_dci_client_tbl *entry)
		diag_update_userspace_clients(DCI_EVENT_MASKS_TYPE);
		ret = dci_ops_tbl[token].send_event_mask(token);
		if (ret != DIAG_DCI_NO_ERROR) {
		mutex_unlock(&driver->dci_mutex);
		return ret;
		}