diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/usb/host/ehci-dbg.c | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/usb/host/ehci-dbg.c')
| -rw-r--r-- | drivers/usb/host/ehci-dbg.c | 8 |
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 ( | |||
| 455 | (scratch >> 16) & 0x7fff, | 455 | (scratch >> 16) & 0x7fff, |
| 456 | scratch, | 456 | scratch, |
| 457 | td->urb); | 457 | td->urb); |
| 458 | if (temp < 0) | 458 | if (size < temp) |
| 459 | temp = 0; | ||
| 460 | else if (size < temp) | ||
| 461 | temp = size; | 459 | temp = size; |
| 462 | size -= temp; | 460 | size -= temp; |
| 463 | next += temp; | 461 | next += temp; |
| @@ -466,9 +464,7 @@ static void qh_lines ( | |||
| 466 | } | 464 | } |
| 467 | 465 | ||
| 468 | temp = snprintf (next, size, "\n"); | 466 | temp = snprintf (next, size, "\n"); |
| 469 | if (temp < 0) | 467 | if (size < temp) |
| 470 | temp = 0; | ||
| 471 | else if (size < temp) | ||
| 472 | temp = size; | 468 | temp = size; |
| 473 | size -= temp; | 469 | size -= temp; |
| 474 | next += temp; | 470 | next += temp; |