Changeset d085df10 in mainline for kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

Timestamp:

2012-09-23T16:19:26Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

21aab25

Parents:

47d2ca9 (diff), 40ad375 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge changes from the beagleboard-xm branch

File:

• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (1 diff)

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -96 +96 @@
                 ++order;
         }
-        printf("Allocating %d (2^%d) frames.\n", size, order);
         /* prefer highmem as we don't care about virtual mapping. */
         void *buffer = frame_alloc(order, FRAME_LOWMEM);
-        ASSERT(buffer);
+        if (!buffer) {
+                printf("Failed to allocate framebuffer.\n");
+                return;
+        }
 
         amdm37x_dispc_setup_fb(beagleboard.dispc, width, height, bpp,