diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-04-03 17:51:55 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-04-03 18:22:20 -0400 |
| commit | c1cf36ee29e41901ecd382f0258110ebb4a0124e (patch) | |
| tree | 7e655104c841c08dc39b7d3e8f5025f2e51a7961 /hw | |
| parent | 2d0a4fff7985f58c21023cc4757090ee67067593 (diff) | |
DPMS: Simplify command line parsing
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/common/xf86DPMS.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 1687f2cb5..46d105ce5 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -64,8 +64,6 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags) DPMSKey = &DPMSKeyIndex; - if (DPMSDisabledSwitch) - DPMSEnabled = FALSE; if (!dixSetPrivate(&pScreen->devPrivates, DPMSKey, xcalloc(sizeof(DPMSRec), 1))) return FALSE; @@ -74,9 +72,9 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags) pScrn->DPMSSet = set; pDPMS->Flags = flags; DPMSOpt = xf86FindOption(pScrn->options, "dpms"); - if (DPMSEnabledSwitch || DPMSDisabledSwitch) { + if (DPMSDisabledSwitch) { enabled_from = X_CMDLINE; - DPMSEnabled = !DPMSDisabledSwitch && DPMSEnabledSwitch; + DPMSEnabled = FALSE; } else if (DPMSOpt) { enabled_from = X_CONFIG; |