Merge "diag: Allow DCI packets to be copied separately" (c3301e52) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/char/diag/diagchar_core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3986,7 +3986,6 @@ static ssize_t diagchar_read(struct file file, char __user buf, size_t count,
		goto exit;
		}

		exit:
		if (driver->data_ready[index] & DCI_DATA_TYPE) {
		data_type = driver->data_ready[index] & DCI_DATA_TYPE;
		mutex_unlock(&driver->diagchar_mutex);
		@@ -4056,7 +4055,9 @@ static ssize_t diagchar_read(struct file file, char __user buf, size_t count,
		mutex_unlock(&driver->dci_mutex);
		goto end;
		}
		exit:
		mutex_unlock(&driver->diagchar_mutex);
		goto ret_end;
		end:
		/*
		* Flush any read that is currently pending on DCI data and
		@@ -4067,6 +4068,7 @@ static ssize_t diagchar_read(struct file file, char __user buf, size_t count,
		diag_ws_on_copy_complete(DIAG_WS_DCI);
		flush_workqueue(driver->diag_dci_wq);
		}
		ret_end:
		return ret;
		}