+ input-fix-oops-on-mk712-load.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     input: fix oops on mk712 load

has been added to the -mm tree.  Its filename is

     input-fix-oops-on-mk712-load.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this


From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>

Fix an oops I got when loading mk712; I don't have the hardware so there is
a goto to the cleanup part of the function.  The goto however went to then
input_free_device() of a pointer that only gets initialized to a real value
3 lines lower, much to the unhappiness of the code in question.  Fix is
just to make a stacked-label sequence for it instead.

Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/input/touchscreen/mk712.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/input/touchscreen/mk712.c~input-fix-oops-on-mk712-load drivers/input/touchscreen/mk712.c
--- devel/drivers/input/touchscreen/mk712.c~input-fix-oops-on-mk712-load	2006-04-23 15:31:38.000000000 -0700
+++ devel-akpm/drivers/input/touchscreen/mk712.c	2006-04-23 15:31:38.000000000 -0700
@@ -170,7 +170,7 @@ static int __init mk712_init(void)
 	    (inw(mk712_io + MK712_STATUS) & 0xf333)) {
 		printk(KERN_WARNING "mk712: device not present\n");
 		err = -ENODEV;
-		goto fail;
+		goto fail_release;
 	}
 
 	if (!(mk712_dev = input_allocate_device())) {
@@ -204,6 +204,7 @@ static int __init mk712_init(void)
 	return 0;
 
  fail:	input_free_device(mk712_dev);
+ fail_release:
 	release_region(mk712_io, 8);
 	return err;
 }
_

Patches currently in -mm which might be from arjan@xxxxxxxxxxxxxxx are

input-fix-oops-on-mk712-load.patch
pi-futex-futex-code-cleanups.patch
pi-futex-introduce-debug_check_no_locks_freed.patch
pi-futex-add-plist-implementation.patch
pi-futex-scheduler-support-for-pi.patch
pi-futex-rt-mutex-core.patch
pi-futex-rt-mutex-docs.patch
pi-futex-rt-mutex-debug.patch
pi-futex-rt-mutex-tester.patch
pi-futex-rt-mutex-futex-api.patch
pi-futex-futex_lock_pi-futex_unlock_pi-support.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux