From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 8 Sep 2011 11:07:26 +0000 (-0400)
Subject: um: sorting out the chan mess, part 1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee4850702bd6980c7baeb6a45142d55744a109a2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

um: sorting out the chan mess, part 1

put references to in and out chans associated with line into
explicit struct chan * fields in it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 3a95498155a1..390920d63a24 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -547,6 +547,7 @@ int parse_chan_pair(char *str, struct line *line, int device,
 	char *in, *out;
 
 	if (!list_empty(chans)) {
+		line->chan_in = line->chan_out = NULL;
 		free_chan(chans);
 		INIT_LIST_HEAD(chans);
 	}
@@ -565,6 +566,7 @@ int parse_chan_pair(char *str, struct line *line, int device,
 
 		new->input = 1;
 		list_add(&new->list, chans);
+		line->chan_in = new;
 
 		new = parse_chan(line, out, device, opts, error_out);
 		if (new == NULL)
@@ -572,6 +574,7 @@ int parse_chan_pair(char *str, struct line *line, int device,
 
 		list_add(&new->list, chans);
 		new->output = 1;
+		line->chan_out = new;
 	}
 	else {
 		new = parse_chan(line, str, device, opts, error_out);
@@ -581,6 +584,7 @@ int parse_chan_pair(char *str, struct line *line, int device,
 		list_add(&new->list, chans);
 		new->input = 1;
 		new->output = 1;
+		line->chan_in = line->chan_out = new;
 	}
 	return 0;
 }
diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h
index 95991994a93b..6cb05a22e9b0 100644
--- a/arch/um/drivers/line.h
+++ b/arch/um/drivers/line.h
@@ -39,6 +39,7 @@ struct line {
 
 	char *init_str;
 	struct list_head chan_list;
+	struct chan *chan_in, *chan_out;
 
 	/*This lock is actually, mostly, local to*/
 	spinlock_t lock;