aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/acornfb.c2
-rw-r--r--drivers/video/i810/i810_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index b058273527bb..76448d6ae896 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1269,7 +1269,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
1269 */ 1269 */
1270 page = virt_to_page(virtual_start); 1270 page = virt_to_page(virtual_start);
1271 ClearPageReserved(page); 1271 ClearPageReserved(page);
1272 set_page_count(page, 1); 1272 init_page_count(page);
1273 free_page(virtual_start); 1273 free_page(virtual_start);
1274 1274
1275 virtual_start += PAGE_SIZE; 1275 virtual_start += PAGE_SIZE;
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index d8467c03b49f..788297e9d59e 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
1508 int size = ((cursor->image.width + 7) >> 3) * 1508 int size = ((cursor->image.width + 7) >> 3) *
1509 cursor->image.height; 1509 cursor->image.height;
1510 int i; 1510 int i;
1511 u8 *data = kmalloc(64 * 8, GFP_KERNEL); 1511 u8 *data = kmalloc(64 * 8, GFP_ATOMIC);
1512 1512
1513 if (data == NULL) 1513 if (data == NULL)
1514 return -ENOMEM; 1514 return -ENOMEM;