From b7f76d21708ba7e5913faf8e9e7be1d7567d307e Mon Sep 17 00:00:00 2001
From: Max Vozeler <mvz@vozeler.com>
Date: Tue, 21 Sep 2010 17:43:30 +0200
Subject: [PATCH] --- yaml --- r: 219965 b: refs/heads/master c:
 584c5b7cf06194464240280483ee0376cdddbbae h: refs/heads/master i:   219963:
 8a68ec7074c7aa5b8f18b8c4339963e91ee6f08b v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/usbip/usbip_event.c | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d5ed692bd21b..544ef283db13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c9a32f0192e656daa2ff3c9149f6d71b4a1b873
+refs/heads/master: 584c5b7cf06194464240280483ee0376cdddbbae
diff --git a/trunk/drivers/staging/usbip/usbip_event.c b/trunk/drivers/staging/usbip/usbip_event.c
index a2566f1075d5..af3832b03e4b 100644
--- a/trunk/drivers/staging/usbip/usbip_event.c
+++ b/trunk/drivers/staging/usbip/usbip_event.c
@@ -38,21 +38,13 @@ static int event_handler(struct usbip_device *ud)
 			ud->eh_ops.shutdown(ud);
 
 			ud->event &= ~USBIP_EH_SHUTDOWN;
-
-			break;
 		}
 
-		/* Stop the error handler. */
-		if (ud->event & USBIP_EH_BYE)
-			return -1;
-
 		/* Reset the device. */
 		if (ud->event & USBIP_EH_RESET) {
 			ud->eh_ops.reset(ud);
 
 			ud->event &= ~USBIP_EH_RESET;
-
-			break;
 		}
 
 		/* Mark the device as unusable. */
@@ -60,13 +52,11 @@ static int event_handler(struct usbip_device *ud)
 			ud->eh_ops.unusable(ud);
 
 			ud->event &= ~USBIP_EH_UNUSABLE;
-
-			break;
 		}
 
-		/* NOTREACHED */
-		printk(KERN_ERR "%s: unknown event\n", __func__);
-		return -1;
+		/* Stop the error handler. */
+		if (ud->event & USBIP_EH_BYE)
+			return -1;
 	}
 
 	return 0;