From: Cyrill Gorcunov Date: Tue, 22 Jan 2008 01:18:26 +0000 (-0800) Subject: CRIS: add missed local_irq_restore call X-Git-Tag: v2.6.24~30 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a56d00bbea018cfa6dc62f76db52760872efa1a7;p=linux-2.6-omap-h63xx.git CRIS: add missed local_irq_restore call Signed-off-by: Cyrill Gorcunov Acked-by: Jesper Nilsson Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/cris/arch-v10/kernel/io_interface_mux.c b/arch/cris/arch-v10/kernel/io_interface_mux.c index 3a9114e89ed..f3b327d4ed9 100644 --- a/arch/cris/arch-v10/kernel/io_interface_mux.c +++ b/arch/cris/arch-v10/kernel/io_interface_mux.c @@ -392,6 +392,7 @@ int cris_request_io_interface(enum cris_io_interface ioif, const char *device_id if (((interfaces[ioif].gpio_g_in & gpio_in_pins) != interfaces[ioif].gpio_g_in) || ((interfaces[ioif].gpio_g_out & gpio_out_pins) != interfaces[ioif].gpio_g_out) || ((interfaces[ioif].gpio_b & gpio_pb_pins) != interfaces[ioif].gpio_b)) { + local_irq_restore(flags); printk(KERN_CRIT "cris_request_io_interface: Could not get required pins for interface %u\n", ioif); return -EBUSY;