Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 0cb53ca8d343..7f4ace73d44a 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/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;