Attachment 121481 Details for Bug 93675 – Move create after probe

[patch] Move create after probe

create_after_probe.diff (text/plain), 1.07 KB, created by Kyle Guinn on 2016-02-03 06:26:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Guinn

Created: 2016-02-03 06:26:57 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/src/via_outputs.c b/src/via_outputs.c
>--- a/src/via_outputs.c
>+++ b/src/via_outputs.c
>@@ -1006,8 +1006,13 @@
>     struct ViaVT1632PrivateData *private_data = NULL;
>     I2CBusPtr pBus = NULL;
>     I2CDevPtr pDev = NULL;
>+    I2CSlaveAddr addr = 0x10;
> 
>-    if (!pVia->pI2CBus2 || !pVia->pI2CBus3) {
>+    if (pVia->pI2CBus3 && xf86I2CProbeAddress(pVia->pI2CBus3, addr)) {
>+        pBus = pVia->pI2CBus3;
>+    } else if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, addr)) {
>+        pBus = pVia->pI2CBus2;
>+    } else {
>         return;
>     }
> 
>@@ -1017,16 +1022,8 @@
>     }
> 
>     pDev->DevName = "VT1632";
>-    pDev->SlaveAddr = 0x10;
>-
>-    if (xf86I2CProbeAddress(pVia->pI2CBus3, pDev->SlaveAddr)) {
>-        pDev->pI2CBus = pVia->pI2CBus3;
>-    } else if (xf86I2CProbeAddress(pVia->pI2CBus2, pDev->SlaveAddr)) {
>-        pDev->pI2CBus = pVia->pI2CBus2;
>-    } else {
>-        xf86DestroyI2CDevRec(pDev, TRUE);
>-        return;
>-    }
>+    pDev->SlaveAddr = addr;
>+    pDev->pI2CBus = pBus;
> 
>     if (!xf86I2CDevInit(pDev)) {
>         xf86DestroyI2CDevRec(pDev, TRUE);

Actions: View | Splinter Review

Attachments on bug 93675: 120975 | 121481 | 121584

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.