diff options
| author | Samuel Ortiz <sameo@openedhand.com> | 2007-09-27 09:42:26 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@openedhand.com> | 2007-09-27 09:42:26 +0000 |
| commit | 5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c (patch) | |
| tree | 13b179b2cce30dde411377006432b5eccc54f9e3 /meta | |
| parent | 939d45757811335c6a9ccde8d7a769d84b0512f3 (diff) | |
| download | openembedded-core-5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c.tar.gz openembedded-core-5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c.tar.bz2 openembedded-core-5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c.tar.xz openembedded-core-5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c.zip | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch | 16 | ||||
| -rw-r--r-- | meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb | 2 |
2 files changed, 12 insertions, 6 deletions
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 8f53b55a3..5a51d1c3f 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 02ef0994a..c1883800b 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" |