X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fdrivers%2Ftty.c;h=94c9265a4f2ca54e034f4f79c11bf48ee061bdf2;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=9f70edf5d8ef027c645de108ef9cd901f0f8cd27;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index 9f70edf5d..94c9265a4 100644
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -1,4 +1,4 @@
-/*
+/* 
  * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -25,17 +25,17 @@ static void *tty_chan_init(char *str, int device, struct chan_opts *opts)
 	if(*str != ':'){
 		printk("tty_init : channel type 'tty' must specify "
 		       "a device\n");
-		return NULL;
+		return(NULL);
 	}
 	str++;
 
 	data = um_kmalloc(sizeof(*data));
 	if(data == NULL)
-		return NULL;
+		return(NULL);
 	*data = ((struct tty_chan) { .dev 	= str,
 				     .raw 	= opts->raw });
-
-	return data;
+				     
+	return(data);
 }
 
 static int tty_open(int input, int output, int primary, void *d,
@@ -45,21 +45,19 @@ static int tty_open(int input, int output, int primary, void *d,
 	int fd, err;
 
 	fd = os_open_file(data->dev, of_set_rw(OPENFLAGS(), input, output), 0);
-	if(fd < 0)
-		return fd;
-
+	if(fd < 0) return(fd);
 	if(data->raw){
 		CATCH_EINTR(err = tcgetattr(fd, &data->tt));
 		if(err)
-			return err;
+			return(err);
 
 		err = raw(fd);
 		if(err)
-			return err;
+			return(err);
 	}
 
 	*dev_out = data->dev;
-	return fd;
+	return(fd);
 }
 
 struct chan_ops tty_ops = {
@@ -74,3 +72,14 @@ struct chan_ops tty_ops = {
 	.free		= generic_free,
 	.winch		= 0,
 };
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */