diff options
Diffstat (limited to 'drivers/video/smscufx.c')
-rw-r--r-- | drivers/video/smscufx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index af3ef27ad36c..5533a32c6ca1 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * smscufx.c -- Framebuffer driver for SMSC UFX USB controller | 2 | * smscufx.c -- Framebuffer driver for SMSC UFX USB controller |
3 | * | 3 | * |
4 | * Copyright (C) 2011 Steve Glendinning <steve.glendinning@smsc.com> | 4 | * Copyright (C) 2011 Steve Glendinning <steve.glendinning@shawell.net> |
5 | * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> | 5 | * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> |
6 | * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> | 6 | * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> |
7 | * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> | 7 | * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> |
@@ -904,7 +904,7 @@ static ssize_t ufx_ops_write(struct fb_info *info, const char __user *buf, | |||
904 | result = fb_sys_write(info, buf, count, ppos); | 904 | result = fb_sys_write(info, buf, count, ppos); |
905 | 905 | ||
906 | if (result > 0) { | 906 | if (result > 0) { |
907 | int start = max((int)(offset / info->fix.line_length) - 1, 0); | 907 | int start = max((int)(offset / info->fix.line_length), 0); |
908 | int lines = min((u32)((result / info->fix.line_length) + 1), | 908 | int lines = min((u32)((result / info->fix.line_length) + 1), |
909 | (u32)info->var.yres); | 909 | (u32)info->var.yres); |
910 | 910 | ||
@@ -1002,7 +1002,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, | |||
1002 | /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ | 1002 | /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ |
1003 | if (cmd == UFX_IOCTL_REPORT_DAMAGE) { | 1003 | if (cmd == UFX_IOCTL_REPORT_DAMAGE) { |
1004 | /* If we have a damage-aware client, turn fb_defio "off" | 1004 | /* If we have a damage-aware client, turn fb_defio "off" |
1005 | * To avoid perf imact of unecessary page fault handling. | 1005 | * To avoid perf imact of unnecessary page fault handling. |
1006 | * Done by resetting the delay for this fb_info to a very | 1006 | * Done by resetting the delay for this fb_info to a very |
1007 | * long period. Pages will become writable and stay that way. | 1007 | * long period. Pages will become writable and stay that way. |
1008 | * Reset to normal value when all clients have closed this fb. | 1008 | * Reset to normal value when all clients have closed this fb. |
@@ -1466,7 +1466,7 @@ static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len) | |||
1466 | /* all FF's in the first 16 bytes indicates nothing is connected */ | 1466 | /* all FF's in the first 16 bytes indicates nothing is connected */ |
1467 | for (i = 0; i < 16; i++) { | 1467 | for (i = 0; i < 16; i++) { |
1468 | if (edid[i] != 0xFF) { | 1468 | if (edid[i] != 0xFF) { |
1469 | pr_debug("edid data read succesfully"); | 1469 | pr_debug("edid data read successfully"); |
1470 | return EDID_LENGTH; | 1470 | return EDID_LENGTH; |
1471 | } | 1471 | } |
1472 | } | 1472 | } |
@@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display"); | |||
1972 | module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); | 1972 | module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); |
1973 | MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); | 1973 | MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); |
1974 | 1974 | ||
1975 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1975 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1976 | MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); | 1976 | MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); |
1977 | MODULE_LICENSE("GPL"); | 1977 | MODULE_LICENSE("GPL"); |