diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-01-21 17:18:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 19:39:41 -0800 |
| commit | a56d00bbea018cfa6dc62f76db52760872efa1a7 (patch) | |
| tree | 580049d7c66e0319656ae0a0482380a56b26666c /arch | |
| parent | 48ccf3dac341118992b70ca89c47728e8b1d300b (diff) | |
| download | linux-a56d00bbea018cfa6dc62f76db52760872efa1a7.tar.gz linux-a56d00bbea018cfa6dc62f76db52760872efa1a7.tar.bz2 linux-a56d00bbea018cfa6dc62f76db52760872efa1a7.zip | |
CRIS: add missed local_irq_restore call
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/arch-v10/kernel/io_interface_mux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v10/kernel/io_interface_mux.c b/arch/cris/arch-v10/kernel/io_interface_mux.c index 3a9114e89edf..f3b327d4ed9c 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; |