projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
sm501fb.c
diff --git
a/drivers/video/sm501fb.c
b/drivers/video/sm501fb.c
index f94ae84a58cd54eabd267a9e4d33384b346755ec..dcd98793d5681e14e7521e1f9efcf92806fe4f8b 100644
(file)
--- a/
drivers/video/sm501fb.c
+++ b/
drivers/video/sm501fb.c
@@
-159,6
+159,9
@@
static int sm501_alloc_mem(struct sm501fb_info *inf, struct sm501_mem *mem,
break;
case SM501_MEMF_PANEL:
+ if (size > inf->fbmem_len)
+ return -ENOMEM;
+
ptr = inf->fbmem_len - size;
fbi = inf->fb[HEAD_CRT];
@@
-172,9
+175,6
@@
static int sm501_alloc_mem(struct sm501fb_info *inf, struct sm501_mem *mem,
if (fbi && ptr < fbi->fix.smem_len)
return -ENOMEM;
- if (ptr < 0)
- return -ENOMEM;
-
break;
case SM501_MEMF_CRT: