Changeset f97717d9 in mainline for uspace/drv/uhci-hcd/utils/malloc32.h

Timestamp:

2011-03-25T16:22:14Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

da3dafc, e6223239

Parents:

d8421c4 (diff), f08c560 (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 from development

File:

• uspace/drv/uhci-hcd/utils/malloc32.h (modified) (1 diff)

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -50 +50 @@
 static inline uintptr_t addr_to_phys(void *addr)
 {
+        if (addr == NULL)
+                return 0;
+
         uintptr_t result;
         int ret = as_get_physical_mapping(addr, &result);