gpu: pvr: fix locking on the HW recovery reset error path

[sgx.git] / pvr / mmu.c

diff --git a/pvr/mmu.c b/pvr/mmu.c
index 3e7096a..7b9f0af 100644 (file)
--- a/pvr/mmu.c
+++ b/pvr/mmu.c
@@ -311,10 +311,10 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap,
 
        for (i = 0; i < ui32PTPageCount; i++) {
                if (ppsPTInfoList[i] == NULL) {
-                       OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
+                       if (OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
                                   sizeof(struct MMU_PT_INFO),
-                                  (void **) &ppsPTInfoList[i], NULL);
-                       if (ppsPTInfoList[i] == NULL) {
+                                  (void **) &ppsPTInfoList[i], NULL)
+                                       != PVRSRV_OK) {
                                PVR_DPF(PVR_DBG_ERROR,
                                        "_DeferredAllocPagetables: "
                                        "ERROR call to OSAllocMem failed");
@@ -499,9 +499,9 @@ enum PVRSRV_ERROR MMU_Initialise(struct PVRSRV_DEVICE_NODE *psDeviceNode,
                return PVRSRV_ERROR_GENERIC;
        }
 
-       OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
-                  sizeof(struct MMU_CONTEXT), (void **) &psMMUContext, NULL);
-       if (psMMUContext == NULL) {
+       if (OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
+                  sizeof(struct MMU_CONTEXT), (void **) &psMMUContext, NULL)
+                       != PVRSRV_OK) {
                PVR_DPF(PVR_DBG_ERROR,
                         "MMU_Initialise: ERROR call to OSAllocMem failed");
                return PVRSRV_ERROR_GENERIC;
@@ -815,9 +815,9 @@ struct MMU_HEAP *MMU_Create(struct MMU_CONTEXT *psMMUContext,
                return NULL;
        }
 
-       OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
-                  sizeof(struct MMU_HEAP), (void **)&pMMUHeap, NULL);
-       if (pMMUHeap == NULL) {
+       if (OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
+                  sizeof(struct MMU_HEAP), (void **)&pMMUHeap, NULL)
+                       != PVRSRV_OK) {
                PVR_DPF(PVR_DBG_ERROR,
                         "MMU_Create: ERROR call to OSAllocMem failed");
                return NULL;