summaryrefslogtreecommitdiff
path: root/src/mga_merge.c
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2011-09-26 22:35:48 -0400
committerMatt Turner <mattst88@gmail.com>2011-09-27 22:48:21 -0400
commit1036e32e006d496023553ea566cb13ae93933719 (patch)
tree8d20c71fed14ed2883fc883065272eb68ae2ee3c /src/mga_merge.c
parentee09a9a340f8946f2d4a71a431b64189dbb5c256 (diff)
Remove if(E != NULL) checks around free(E)
Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mga_merge.c')
-rw-r--r--src/mga_merge.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c
index e3216c9..c1cf2eb 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -528,8 +528,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
pMga->FbMapSize,
LOOKUP_BEST_REFRESH);
- if (linePitches)
- free(linePitches);
+ free(linePitches);
}
@@ -892,8 +891,7 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
pScrn1->currentMode = pScrn1->modes;
do {
DisplayModePtr p = pScrn1->currentMode->next;
- if(pScrn1->currentMode->Private)
- free(pScrn1->currentMode->Private);
+ free(pScrn1->currentMode->Private);
free(pScrn1->currentMode);
pScrn1->currentMode = p;
}while( pScrn1->currentMode != pScrn1->modes);