From 23cc430adde2d1839b48a3a41fa25026e6e94cb3 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 21 Jan 2008 17:18:26 -0800 Subject: [PATCH] --- yaml --- r: 75600 b: refs/heads/master c: a56d00bbea018cfa6dc62f76db52760872efa1a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/io_interface_mux.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8899f9c7c977..5611f808584c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48ccf3dac341118992b70ca89c47728e8b1d300b +refs/heads/master: a56d00bbea018cfa6dc62f76db52760872efa1a7 diff --git a/trunk/arch/cris/arch-v10/kernel/io_interface_mux.c b/trunk/arch/cris/arch-v10/kernel/io_interface_mux.c index 3a9114e89edf..f3b327d4ed9c 100644 --- a/trunk/arch/cris/arch-v10/kernel/io_interface_mux.c +++ b/trunk/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;