Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/driver/xf86-input-mouse/6920647.patch
author Henry Zhao <Henry.Zhao@Sun.COM>
Sun, 14 Feb 2010 12:18:08 -0800
changeset 900 bab58458e0ac
permissions -rw-r--r--
6920647 Core dump in resume when monitor changed in suspend
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
900
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     1
 
diff -ur old/src/sun_mouse.c new/src/sun_mouse.c
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     2
 
--- src/sun_mouse.c	Thu Feb 11 17:09:23 2010
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     3
 
+++ src/sun_mouse.c	Thu Feb 11 17:10:24 2010
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     4
 
@@ -438,6 +438,9 @@
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     5
 
     ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     6
 
     int result;
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     7
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     8
 
+    if (!pScr->currentMode)
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
     9
 
+	return;
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
    10
 
+
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
    11
 
     if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) ||
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
    12
 
 	(pVuidMse->absres.height != pScr->currentMode->VDisplay))
bab58458e0ac 6920647 Core dump in resume when monitor changed in suspend
Henry Zhao <Henry.Zhao@Sun.COM>
parents:
diff changeset 
    13
 
     {
upstream/oracle/x-cons/x-s12-clone