diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
| commit | 3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (patch) | |
| tree | 2cd8a8d61f350aa3b00e6b0afc998544923f183e /drivers/block/paride/pg.c | |
| parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
| parent | 07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff) | |
Merge branch 'x86/urgent' into x86/core
Diffstat (limited to 'drivers/block/paride/pg.c')
| -rw-r--r-- | drivers/block/paride/pg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index 9dfa27163001..c397b3ddba9b 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c | |||
| @@ -422,7 +422,7 @@ static void xs(char *buf, char *targ, int len) | |||
| 422 | 422 | ||
| 423 | for (k = 0; k < len; k++) { | 423 | for (k = 0; k < len; k++) { |
| 424 | char c = *buf++; | 424 | char c = *buf++; |
| 425 | if (c != ' ' || c != l) | 425 | if (c != ' ' && c != l) |
| 426 | l = *targ++ = c; | 426 | l = *targ++ = c; |
| 427 | } | 427 | } |
| 428 | if (l == ' ') | 428 | if (l == ' ') |