From b942772a74b2299bf4bdfe0dcab83d004d1ed075 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Aug 2008 17:36:23 -0700
Subject: [PATCH] --- yaml --- r: 107790 b: refs/heads/master c:
 f99e8f277f1172c49ac7b0585aed5b094fe235d4 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/char/viocons.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2dd2ad5426de..3fa0d61ead69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 680db0136e0778a0d7e025af7572c6a8d82279e2
+refs/heads/master: f99e8f277f1172c49ac7b0585aed5b094fe235d4
diff --git a/trunk/drivers/char/viocons.c b/trunk/drivers/char/viocons.c
index f48892ba12f5..7feeb774a101 100644
--- a/trunk/drivers/char/viocons.c
+++ b/trunk/drivers/char/viocons.c
@@ -705,7 +705,7 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
 	case KDSKBLED:
 		return 0;
 	}
-	return ret;
+	return -ENOIOCTLCMD;
 }
 
 /*