From: Alan Cox <alan@linux.intel.com>
Date: Wed, 7 Oct 2015 20:37:20 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=64e079c995bfe0b5f53e20f015bdc0657417d2cc;p=FUZIX.git

Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
---

64e079c995bfe0b5f53e20f015bdc0657417d2cc
diff --cc Kernel/platform-coco3/devtty.c
index 074a1ea0,90b514a7..7ed11a5f
--- a/Kernel/platform-coco3/devtty.c
+++ b/Kernel/platform-coco3/devtty.c
@@@ -515,7 -515,9 +515,10 @@@ int gfx_ioctl(uint8_t minor, uarg_t arg
  		if( minor == curminor ) apply_gime( minor );
  		return 0;
  	}
-  error:	udata.u_error = ENOTTY;
 - notty: udata.u_error = ENOTTY;
++	udata.u_error = ENOTTY;
+ 	return -1;
 - inval:	udata.u_error = EINVAL;
++
++inval:	udata.u_error = EINVAL;
  	return -1;
  }