xf86-video-intel: Branch 'modesetting' - src/i830_sdvo.c

[Alan Hourihane]

 src/i830_sdvo.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 71e3e2d4e3b2a2c538fe6f1cea41f442fdb8d756 (from e5c572f841b626b8b6f21a6966a33956d3b0b35b)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Fri Aug 4 20:39:50 2006 +0100

    Fix a problem creating the I2C bus for the SDVOC
    interface, due to a name match with SDVOB.
    
    Bus names must be unique.

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 9a18f57..fe0c41a 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -858,7 +858,10 @@ I830SDVOInit(ScrnInfoPtr pScrn, int outp
 	xfree(sdvo);
 	return NULL;
     }
-    ddcbus->BusName = "SDVO DDC Bus";
+    if (output_device == SDVOB)
+        ddcbus->BusName = "SDVOB DDC Bus";
+    else
+        ddcbus->BusName = "SDVOC DDC Bus";
     ddcbus->scrnIndex = i2cbus->scrnIndex;
     ddcbus->I2CGetByte = I830SDVODDCI2CGetByte;
     ddcbus->I2CPutByte = I830SDVODDCI2CPutByte;