diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/block/paride/pg.c | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
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 == ' ') |