]>
Commit | Line | Data |
---|---|---|
147366a6 SS |
1 | diff -up xf86-video-nv-2.1.6/src/nv_setup.c.jx xf86-video-nv-2.1.6/src/nv_setup.c |
2 | --- xf86-video-nv-2.1.6/src/nv_setup.c.jx 2007-09-17 17:17:51.000000000 -0400 | |
3 | +++ xf86-video-nv-2.1.6/src/nv_setup.c 2008-02-12 10:19:54.000000000 -0500 | |
4 | @@ -668,27 +668,14 @@ NVCommonSetup(ScrnInfoPtr pScrn) | |
5 | } | |
6 | ||
7 | if(monitorA) { | |
8 | - if((monitorA->features.input_type && pNv->FlatPanel) || | |
9 | - (!monitorA->features.input_type && !pNv->FlatPanel)) | |
10 | - { | |
11 | - if(monitorB) { | |
12 | - free(monitorB); | |
13 | - monitorB = NULL; | |
14 | - } | |
15 | - } else { | |
16 | - free(monitorA); | |
17 | - monitorA = NULL; | |
18 | - } | |
19 | + if(monitorB) { | |
20 | + free(monitorB); | |
21 | + monitorB = NULL; | |
22 | + } | |
23 | } | |
24 | ||
25 | if(monitorB) { | |
26 | - if((monitorB->features.input_type && !pNv->FlatPanel) || | |
27 | - (!monitorB->features.input_type && pNv->FlatPanel)) | |
28 | - { | |
29 | - free(monitorB); | |
30 | - } else { | |
31 | - monitorA = monitorB; | |
32 | - } | |
33 | + monitorA = monitorB; | |
34 | monitorB = NULL; | |
35 | } | |
36 |