FIx oops on mk712 load

[Arjan van de Ven <arjan@linux.intel.com>]

Hi,

the patch below fixes 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@linux.intel.com>


--- linux-2.6.17-rc2-lockdep/drivers/input/touchscreen/mk712.c.org	2006-04-22 17:56:44.000000000 +0200
+++ linux-2.6.17-rc2-lockdep/drivers/input/touchscreen/mk712.c	2006-04-22 17:57:23.000000000 +0200
@@ -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;
 }


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/