Merge "Pass the correct pointer to munmap on failure."

    if (memPtr == NULL)

    if (memPtr == NULL)

        return -1;

        return -1;

    actual = read(fd, memPtr, length);

    pMap->baseAddr = pMap->addr = memPtr;

    pMap->baseLength = pMap->length = length;

    actual = TEMP_FAILURE_RETRY(read(fd, memPtr, length));

    if (actual != length) {

    if (actual != length) {

        LOGE("only read %d of %d bytes\n", (int) actual, (int) length);

        LOGE("only read %d of %d bytes\n", (int) actual, (int) length);

        sysReleaseShmem(pMap);

        sysReleaseShmem(pMap);

        return -1;

        return -1;

    }

    }

    pMap->baseAddr = pMap->addr = memPtr;

    pMap->baseLength = pMap->length = length;

    return 0;

    return 0;

}

}