[openchrome-devel] xf86-video-openchrome: src/via_vt1632.c

[Kevin Brace]

 src/via_vt1632.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f0277d51f8e5d878c38c55fd74a28036cbbb724f
Author: Kevin Brace <kevinbr...@gmx.com>
Date:   Mon Jul 1 20:06:00 2019 -0500

    Consolidate destroying I2C bus device record within viaVT1632Probe()
    
    Signed-off-by: Kevin Brace <kevinbr...@gmx.com>

diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index f7a533a..fedc920 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -475,11 +475,10 @@ viaVT1632Probe(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
     pI2CDevice->SlaveAddr = i2cAddr;
     pI2CDevice->pI2CBus = pI2CBus;
     if (!xf86I2CDevInit(pI2CDevice)) {
-        xf86DestroyI2CDevRec(pI2CDevice, TRUE);
         DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                             "Failed to initialize a device on "
                             "I2C bus.\n"));
-        goto exit;
+        goto free_dev_rec;
     }
 
     xf86I2CReadByte(pI2CDevice, 0, &i2cData);
@@ -497,16 +496,16 @@ viaVT1632Probe(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
                         "Device ID: 0x%04x\n", deviceID));
 
     if ((vendorID != 0x1106) || (deviceID != 0x3192)) {
-        xf86DestroyI2CDevRec(pI2CDevice, TRUE);
         DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
                             "VT1632 external TMDS transmitter not "
                             "detected.\n"));
-        goto exit;
+        goto free_dev_rec;
     }
 
     status = TRUE;
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
                 "VT1632 external TMDS transmitter detected.\n");
+free_dev_rec:
     xf86DestroyI2CDevRec(pI2CDevice, TRUE);
 exit:
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel