Changeset 9fe4db3 in mainline for uspace/drv/bus/usb/ohci/utils/malloc32.h

Timestamp:

2011-12-17T08:38:38Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

65d7b0a

Parents:

f4d5f90 (diff), 792807f (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 with mainline

File:

• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/utils/malloc32.h

@@ -56 +56 @@
         uintptr_t result;
         int ret = as_get_physical_mapping(addr, &result);
-
+        
         if (ret != EOK)
                 return 0;
-        return (result | ((uintptr_t)addr & 0xfff));
+        
+        return result;
 }
 /*----------------------------------------------------------------------------*/