diff options
| author | mdaenzer <mdaenzer> | 2000-09-12 19:17:11 +0000 |
|---|---|---|
| committer | mdaenzer <mdaenzer> | 2000-09-12 19:17:11 +0000 |
| commit | 5df79bd84656b57b729e7737e7fa3b4d1c61a4fc (patch) | |
| tree | 76cbf660b5b660cf8ad3153fdc4d734a8f80f721 /xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c | |
| parent | bffb7818692592295d27010ae985ef373ec4e9fb (diff) | |
merge trunk to ppc-1-0-0-branchppc-1-0-0-20000912
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c b/xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c index b91bd8459..3405a18be 100644 --- a/xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c +++ b/xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c @@ -48,7 +48,7 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c,v 1.9 1999/06/05 15:55:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c,v 1.10 2000/08/11 19:10:44 dawes Exp $ */ #define _elo_C_ /***************************************************************************** @@ -211,14 +211,12 @@ SetupProc( pointer module, xf86CloseSerial (local->fd); if ((local) && (local->name)) xfree (local->name); - if (local) - xfree (local); if ((priv) && (priv->buffer)) XisbFree (priv->buffer); if (priv) xfree (priv); - return (NULL); + return (local); } static Bool |