diff options
| author | Owain G. Ainsworth <oga@openbsd.org> | 2010-07-18 16:01:48 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-07-18 16:01:48 +0100 |
| commit | 9290ad77c5eef438ba02fc26334fd85ab3caa009 (patch) | |
| tree | a2ac0f1be6786545821e7aa75ecbf4bbc332a1f4 /src/i830_dvo.c | |
| parent | 09c5b49b691132d0085c29b74decb45e0d4215e9 (diff) | |
| parent | b2f4de3b7fb73bd51b1fd1b2b044862839c9a6ea (diff) | |
Merge branch 'bleeding_edge-oga' into 2.9.1-oga
Conflicts:
src/i830_display.c
This has now been commited to cvs, so the branch gets pulled.
Diffstat (limited to 'src/i830_dvo.c')
| -rw-r--r-- | src/i830_dvo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_dvo.c b/src/i830_dvo.c index 3deb254b..bccbe7b0 100644 --- a/src/i830_dvo.c +++ b/src/i830_dvo.c @@ -302,7 +302,7 @@ i830_dvo_destroy (xf86OutputPtr output) xf86DestroyI2CBusRec (intel_output->pI2CBus, TRUE, TRUE); if (intel_output->pDDCBus) xf86DestroyI2CBusRec (intel_output->pDDCBus, TRUE, TRUE); - xfree (intel_output); + free (intel_output); } } @@ -407,7 +407,7 @@ i830_dvo_init(ScrnInfoPtr scrn) /* Set up the DDC bus */ ret = I830I2CInit(scrn, &intel_output->pDDCBus, GPIOD, "DVODDC_D"); if (!ret) { - xfree(intel_output); + free(intel_output); return; } @@ -482,7 +482,7 @@ i830_dvo_init(ScrnInfoPtr scrn) if (output == NULL) { xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE); xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE); - xfree(intel_output); + free(intel_output); xf86UnloadSubModule(drv->modhandle); return; } @@ -517,5 +517,5 @@ i830_dvo_init(ScrnInfoPtr scrn) if (pI2CBus != NULL) xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE); xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE); - xfree(intel_output); + free(intel_output); } |