summaryrefslogtreecommitdiff
path: root/src/i810_memory.c
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-12-15 09:35:23 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-12-15 09:35:23 +0000
commit235ff9f8c20d93b22b11cc378f7e53f20a058038 (patch)
treee9ae8dbeaba5b30c57fd04b60a6c8475cc5e1a98 /src/i810_memory.c
parent9e8e19c6fde15fe5b9bb7532316dedeeca54b8d9 (diff)
Bug #1944 (https://bugs.freedesktop.org/show_bug.cgi?id=1944)XORG-6_8_1_901
attachment #1403 (https://bugs.freedesktop.org/attachment.cgi?id=1403): Various I8xx driver fixes, including: - Fixed server crash on reset when a structure allocated in PreInit() was freed on CloseScreen(). - Fixed ring buffer lock ups that happened because the structure that contained ringbuffer data was not zeroed after allocation. - Fixed numerous warnings due to signed unsigned comparisons.
Diffstat (limited to 'src/i810_memory.c')
-rw-r--r--src/i810_memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i810_memory.c b/src/i810_memory.c
index 8b899fbe..75ec2442 100644
--- a/src/i810_memory.c
+++ b/src/i810_memory.c
@@ -55,7 +55,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int
I810AllocLow(I810MemRange * result, I810MemRange * pool, int size)
{
- if (size > pool->Size)
+ if (size > (long)pool->Size)
return 0;
pool->Size -= size;
@@ -69,7 +69,7 @@ I810AllocLow(I810MemRange * result, I810MemRange * pool, int size)
int
I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size)
{
- if (size > pool->Size)
+ if (size > (long)pool->Size)
return 0;
pool->Size -= size;