From 615cabc1b9182cad9fdabf46b52aa1609f692ab1 Mon Sep 17 00:00:00 2001
From: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date: Tue, 30 Aug 2011 00:54:21 +0400
Subject: [PATCH] --- yaml --- r: 268124 b: refs/heads/master c:
 06b3f44a9784c48c64dfedf5f012deb93049a3aa h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/lirc/lirc_sasem.c | 46 ++++++++++++-------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 29bd3cf9920a..f774b80b25e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6699291f89aa3e22490c9c93620350f92015b699
+refs/heads/master: 06b3f44a9784c48c64dfedf5f012deb93049a3aa
diff --git a/trunk/drivers/staging/lirc/lirc_sasem.c b/trunk/drivers/staging/lirc/lirc_sasem.c
index 7080cdeab5a6..a2d18b0aa048 100644
--- a/trunk/drivers/staging/lirc/lirc_sasem.c
+++ b/trunk/drivers/staging/lirc/lirc_sasem.c
@@ -814,29 +814,6 @@ static int sasem_probe(struct usb_interface *interface,
 		printk(KERN_INFO "%s: Registered Sasem driver (minor:%d)\n",
 			__func__, lirc_minor);
 
-alloc_status_switch:
-
-	switch (alloc_status) {
-
-	case 7:
-		if (vfd_ep_found)
-			usb_free_urb(tx_urb);
-	case 6:
-		usb_free_urb(rx_urb);
-	case 5:
-		lirc_buffer_free(rbuf);
-	case 4:
-		kfree(rbuf);
-	case 3:
-		kfree(driver);
-	case 2:
-		kfree(context);
-		context = NULL;
-	case 1:
-		retval = -ENOMEM;
-		goto unlock;
-	}
-
 	/* Needed while unregistering! */
 	driver->minor = lirc_minor;
 
@@ -867,6 +844,29 @@ static int sasem_probe(struct usb_interface *interface,
 			__func__, dev->bus->busnum, dev->devnum);
 unlock:
 	mutex_unlock(&context->ctx_lock);
+
+alloc_status_switch:
+	switch (alloc_status) {
+
+	case 7:
+		if (vfd_ep_found)
+			usb_free_urb(tx_urb);
+	case 6:
+		usb_free_urb(rx_urb);
+	case 5:
+		lirc_buffer_free(rbuf);
+	case 4:
+		kfree(rbuf);
+	case 3:
+		kfree(driver);
+	case 2:
+		kfree(context);
+		context = NULL;
+	case 1:
+		if (retval == 0)
+			retval = -ENOMEM;
+	}
+
 exit:
 	return retval;
 }