xserver: Branch 'master'

[Egbert Eich]

 hw/xfree86/i2c/xf86i2c.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 735da3dcd09f59c40f68eca8c9a91c2e826cd1b9 (from 7c5de093d499de63d39fe038d86da0a085262017)
Author: Egbert Eich <eich at freedesktop.org>
Date:   Tue Sep 4 16:42:57 2007 +0200

    Fixing xf86I2CGetScreenBuses(), now dereferencing the correct pointer.

diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index 0139612..5cc83fa 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -883,7 +883,7 @@ xf86I2CGetScreenBuses(int scrnIndex, I2C
 	    continue;
 
         *pppI2CBus = xnfrealloc(*pppI2CBus, n * sizeof(I2CBusPtr));
-	pppI2CBus[n - 1] = pI2CBus;
+	(*pppI2CBus)[n - 1] = pI2CBus;
     }
 
     return n;