CRIS: add missed local_irq_restore call
authorCyrill Gorcunov <gorcunov@gmail.com>
Tue, 22 Jan 2008 01:18:26 +0000 (17:18 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 03:39:41 +0000 (19:39 -0800)
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@akpm@linux-foundation.org>
arch/cris/arch-v10/kernel/io_interface_mux.c

index 3a9114e89edfcc1f2ef6e87b8e7c7bc6ca1fd35d..f3b327d4ed9cf912040a56310b69cad7063f7fd8 100644 (file)
@@ -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;