summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mouse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mouse.c b/src/mouse.c
index 238d7f7..d883b82 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -2431,13 +2431,13 @@ SetupMouse(InputInfoPtr pInfo)
* for the new protocol.
*/
if (pMse->oldProtocolID != pMse->protocolID) {
- pointer tmp = NULL;
if ((pMse->protocolID >= 0)
&& (pMse->protocolID < PROT_NUMPROTOS)
- && mouseProtocols[pMse->protocolID].defaults)
- tmp = xf86OptionListCreate(
+ && mouseProtocols[pMse->protocolID].defaults) {
+ pointer tmp = xf86OptionListCreate(
mouseProtocols[pMse->protocolID].defaults, -1, 0);
- pInfo->options = xf86OptionListMerge(pInfo->options, tmp);
+ pInfo->options = xf86OptionListMerge(pInfo->options, tmp);
+ }
/*
* If baudrate is set write it back to the option
* list so that the serial interface code can access