summaryrefslogtreecommitdiff
authorZhenyu Wang <zhenyu.z.wang@intel.com>2008-01-31 10:26:46 (GMT)
committer Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>2008-02-05 19:06:11 (GMT)
commit48eac1a03785c6a795193bb884b2c23dcd5b815b (patch)
treebda46cc88342e4d807e8c7b7150b95b2e9b0dc76
parent103dc34f3afc17cea7e086927e124a30c605a686 (diff)
downloadxf86-video-intel-48eac1a03785c6a795193bb884b2c23dcd5b815b.zip
xf86-video-intel-48eac1a03785c6a795193bb884b2c23dcd5b815b.tar.gz
xf86-video-intel-48eac1a03785c6a795193bb884b2c23dcd5b815b.tar.bz2
Don't crash if SW cursor
In case of device option or hw cursor allocation fails.
-rw-r--r--src/i830_memory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 85b6528..43d2e0f 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1929,7 +1929,8 @@ i830_bind_all_memory(ScrnInfoPtr pScrn)
}
#endif
}
- i830_update_cursor_offsets(pScrn);
+ if (!pI830->SWCursor)
+ i830_update_cursor_offsets(pScrn);
return TRUE;
}