From 5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@openedhand.com>
Date: Thu, 27 Sep 2007 09:42:26 +0000
Subject: linux-rp-2.6.22+2.6.23-rc4: Release console semaphore on an error
 path.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2813 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch | 16 +++++++++++-----
 meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'meta/packages/linux')

diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
index 8f53b55a30..5a51d1c3f5 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
+++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
@@ -1,11 +1,11 @@
 ---
- drivers/char/vt_ioctl.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/char/vt_ioctl.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 Index: linux-2.6.22/drivers/char/vt_ioctl.c
 ===================================================================
 --- linux-2.6.22.orig/drivers/char/vt_ioctl.c	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/char/vt_ioctl.c	2007-09-27 11:05:29.000000000 +0200
++++ linux-2.6.22/drivers/char/vt_ioctl.c	2007-09-27 11:58:42.000000000 +0200
 @@ -770,6 +770,7 @@
  		/*
  		 * Switching-from response
@@ -30,9 +30,15 @@ Index: linux-2.6.22/drivers/char/vt_ioctl.c
  			}
  		}
  
-@@ -813,6 +812,7 @@
- 			if (arg != VT_ACKACQ)
+@@ -810,9 +809,12 @@
+ 			/*
+ 			 * If it's just an ACK, ignore it
+ 			 */
+-			if (arg != VT_ACKACQ)
++			if (arg != VT_ACKACQ) {
++				release_console_sem();
  				return -EINVAL;
++			}
  		}
 +		release_console_sem();
  
diff --git a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
index 02ef0994a8..c1883800b5 100644
--- a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r5"
+PR = "r6"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_htcuniversal = "1"
-- 
cgit v1.2.3