diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /drivers/video/console/fbcon_rotate.h | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/video/console/fbcon_rotate.h')
| -rw-r--r-- | drivers/video/console/fbcon_rotate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon_rotate.h b/drivers/video/console/fbcon_rotate.h index 75be5ce53dc5..e233444cda66 100644 --- a/drivers/video/console/fbcon_rotate.h +++ b/drivers/video/console/fbcon_rotate.h | |||
| @@ -45,7 +45,7 @@ static inline void rotate_ud(const char *in, char *out, u32 width, u32 height) | |||
| 45 | width = (width + 7) & ~7; | 45 | width = (width + 7) & ~7; |
| 46 | 46 | ||
| 47 | for (i = 0; i < height; i++) { | 47 | for (i = 0; i < height; i++) { |
| 48 | for (j = 0; j < width; j++) { | 48 | for (j = 0; j < width - shift; j++) { |
| 49 | if (pattern_test_bit(j, i, width, in)) | 49 | if (pattern_test_bit(j, i, width, in)) |
| 50 | pattern_set_bit(width - (1 + j + shift), | 50 | pattern_set_bit(width - (1 + j + shift), |
| 51 | height - (1 + i), | 51 | height - (1 + i), |