From c6a204f504276192d30a238f8b6610b9ee7ffa0f Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Tue, 21 Oct 2008 00:47:23 -0400
Subject: [PATCH] --- yaml --- r: 127210 b: refs/heads/master c:
 e64a5219296fff11a0da0322b43012265cd3b327 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/ehci-dbg.c | 8 ++------
 trunk/drivers/usb/misc/usbtest.c  | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 038c4159362b..b61294658b18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b438e30c686b1e904c759d3354d335050ab33f9
+refs/heads/master: e64a5219296fff11a0da0322b43012265cd3b327
diff --git a/trunk/drivers/usb/host/ehci-dbg.c b/trunk/drivers/usb/host/ehci-dbg.c
index 0cb53ca8d343..7f4ace73d44a 100644
--- a/trunk/drivers/usb/host/ehci-dbg.c
+++ b/trunk/drivers/usb/host/ehci-dbg.c
@@ -455,9 +455,7 @@ static void qh_lines (
 				(scratch >> 16) & 0x7fff,
 				scratch,
 				td->urb);
-		if (temp < 0)
-			temp = 0;
-		else if (size < temp)
+		if (size < temp)
 			temp = size;
 		size -= temp;
 		next += temp;
@@ -466,9 +464,7 @@ static void qh_lines (
 	}
 
 	temp = snprintf (next, size, "\n");
-	if (temp < 0)
-		temp = 0;
-	else if (size < temp)
+	if (size < temp)
 		temp = size;
 	size -= temp;
 	next += temp;
diff --git a/trunk/drivers/usb/misc/usbtest.c b/trunk/drivers/usb/misc/usbtest.c
index 444c69c447be..5f1a19d1497d 100644
--- a/trunk/drivers/usb/misc/usbtest.c
+++ b/trunk/drivers/usb/misc/usbtest.c
@@ -192,8 +192,6 @@ static struct urb *simple_alloc_urb (
 {
 	struct urb		*urb;
 
-	if (bytes < 0)
-		return NULL;
 	urb = usb_alloc_urb (0, GFP_KERNEL);
 	if (!urb)
 		return urb;