--- a/open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c Wed May 30 13:19:01 2012 -0700
@@ -266,7 +266,7 @@
astReg = &pAST->SavedReg;
/* Save Misc */
- GetReg(MISC_PORT_READ, astReg->MISC);
+ astReg->MISC = GetReg(MISC_PORT_READ);
/* Save SR */
for (i=0; i<4; i++)
@@ -281,10 +281,10 @@
GetIndexReg(GR_PORT, (UCHAR) (i), astReg->GR[i]);
/* Save AR */
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
for (i=0; i<20; i++)
GetIndexReg(AR_PORT_WRITE, (UCHAR) (i), astReg->AR[i]);
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
SetReg (AR_PORT_WRITE, 0x20); /* set POS */
/* Save DAC */
@@ -320,7 +320,7 @@
SetIndexReg(GR_PORT, (UCHAR) (i), astReg->GR[i]);
/* Restore AR */
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
for (i=0; i<20; i++)
{
SetReg(AR_PORT_WRITE, (UCHAR) i);
@@ -329,7 +329,7 @@
SetReg(AR_PORT_WRITE, 0x14);
SetReg(AR_PORT_WRITE, 0x00);
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
SetReg (AR_PORT_WRITE, 0x20); /* set POS */
/* Restore DAC */