From c62e33372d4ed00a768157bbf7dfa51767f8044e Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sat, 4 Sep 2010 14:32:25 +0200 Subject: [PATCH] --- yaml --- r: 219733 b: refs/heads/master c: cc92ac20496fa24209712ab561738f4f8b57336a h: refs/heads/master i: 219731: 44b742c067f10111e81bf235e60e1141aa63b45c v: v3 --- [refs] | 2 +- trunk/drivers/staging/lirc/lirc_imon.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9d08cdaf5b9..57cd1d792b9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54669fdeb24b129cfa6f188796430be79ebc8688 +refs/heads/master: cc92ac20496fa24209712ab561738f4f8b57336a diff --git a/trunk/drivers/staging/lirc/lirc_imon.c b/trunk/drivers/staging/lirc/lirc_imon.c index 818bec0bb912..2661718b9645 100644 --- a/trunk/drivers/staging/lirc/lirc_imon.c +++ b/trunk/drivers/staging/lirc/lirc_imon.c @@ -873,7 +873,7 @@ static int imon_probe(struct usb_interface *interface, if (lirc_minor < 0) { err("%s: lirc_register_driver failed", __func__); alloc_status = 7; - goto alloc_status_switch; + goto unlock; } else dev_info(dev, "Registered iMON driver " "(lirc minor: %d)\n", lirc_minor); @@ -929,8 +929,9 @@ static int imon_probe(struct usb_interface *interface, "usb<%d:%d> initialized\n", vendor, product, ifnum, usbdev->bus->busnum, usbdev->devnum); -alloc_status_switch: +unlock: mutex_unlock(&context->ctx_lock); +alloc_status_switch: switch (alloc_status) { case 7: