[openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_i2c.c src/via_ums.c

[Kevin Brace]

 configure.ac  |    2 +-
 src/via_i2c.c |   14 ++++++++------
 src/via_ums.c |    6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit f0e0fe936f14648542bb35cce6fac8ec756babd2
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jul 12 15:27:36 2019 -0700

    Version bumped to 0.6.189
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index ad796d4..ace92ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.188],
+        [0.6.189],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit aa9efaa491941a971d7a41e331ec12eedc09040e
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jul 12 15:26:43 2019 -0700

    Initialize PCI bus access pointers within viaProbeVRAM()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index 6dce3bd..a8f5e2e 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -758,8 +758,8 @@ static Bool
 viaProbeVRAM(ScrnInfoPtr pScrn)
 {
 #ifdef HAVE_PCIACCESS
-    struct pci_device *hostBridge;
-    struct pci_device *dramController;
+    struct pci_device *hostBridge = NULL;
+    struct pci_device *dramController = NULL;
 #endif
     CARD8 videoRAM;
     CARD16 hostBridgeVendorID, hostBridgeDeviceID;
commit a6158869216eaea769a33dbec86af88200bff0b8
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jul 12 14:58:28 2019 -0700

    Declare viaProbeVRAM() as a static type function
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index 533106f..6dce3bd 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -754,7 +754,7 @@ umsCreate(ScrnInfoPtr pScrn)
     return TRUE;
 }
 
-Bool
+static Bool
 viaProbeVRAM(ScrnInfoPtr pScrn)
 {
 #ifdef HAVE_PCIACCESS
commit a09a6394e85a0d0c4af055872c4dc3d38ecd01e6
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jul 12 14:52:42 2019 -0700

    Declare pointer variables before initialization inside via_i2c.c
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_i2c.c b/src/via_i2c.c
index 6b5b952..5f1288f 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -73,12 +73,13 @@ ViaI2C1GetBits(I2CBusPtr Bus, int *clock, int *data)
 static I2CBusPtr
 ViaI2CBus1Init(ScrnInfoPtr pScrn)
 {
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    I2CBusPtr pI2CBus;
+
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered ViaI2CBus1Init.\n"));
 
-    I2CBusPtr pI2CBus = xf86CreateI2CBusRec();
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-
+    pI2CBus = xf86CreateI2CBusRec();
     if (!pI2CBus) {
         DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                             "xf86CreateI2CBusRec failed.\n"));
@@ -156,12 +157,13 @@ ViaI2C2GetBits(I2CBusPtr Bus, int *clock, int *data)
 static I2CBusPtr
 ViaI2CBus2Init(ScrnInfoPtr pScrn)
 {
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    I2CBusPtr pI2CBus;
+
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered ViaI2CBus2Init.\n"));
 
-    I2CBusPtr pI2CBus = xf86CreateI2CBusRec();
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-
+    pI2CBus = xf86CreateI2CBusRec();
     if (!pI2CBus) {
         DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                             "xf86CreateI2CBusRec failed.\n"));