diff options
Diffstat (limited to 'drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c')
| -rw-r--r-- | drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c b/drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c index 2d81546..fc3afa8 100644 --- a/drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c +++ b/drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c @@ -1,9 +1,9 @@ /* * Copyright (C) 2010-2012 ARM Limited. All rights reserved. - * + * * This program is free software and is provided to you under the terms of the GNU General Public License version 2 * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. - * + * * A copy of the licence is included with the program, and can also be obtained from Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -77,8 +77,6 @@ ump_memory_backend * ump_os_memory_backend_create(const int max_allocation) backend->stat = os_stat; backend->pre_allocate_physical_check = NULL; backend->adjust_to_mali_phys = NULL; - backend->get = NULL; - backend->set = NULL; return backend; } @@ -136,7 +134,7 @@ static int os_allocate(void* ctx, ump_dd_mem * descriptor) return 0; /* failure */ } - while (left > 0) + while (left > 0 && ((info->num_pages_allocated + pages_allocated) < info->num_pages_max)) { struct page * new_page; @@ -149,7 +147,6 @@ static int os_allocate(void* ctx, ump_dd_mem * descriptor) } if (NULL == new_page) { - MSG_ERR(("UMP memory allocated: Out of Memory !!\n")); break; } |