diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /xorg-server/hw/xfree86 | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/hw/xfree86')
| -rw-r--r-- | xorg-server/hw/xfree86/fbdevhw/fbdevhw.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c index d7b4d3c20..2019741b2 100644 --- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c +++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c @@ -98,8 +98,6 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn) { if (fbdevHWPrivateIndex < 0) return; - if (FBDEVHWPTR(pScrn) == NULL) - return; free(FBDEVHWPTR(pScrn)); FBDEVHWPTRLVAL(pScrn) = NULL; } |