diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-04 20:39:50 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-04 20:39:50 +0100 |
| commit | 71e3e2d4e3b2a2c538fe6f1cea41f442fdb8d756 (patch) | |
| tree | ab8e1dbb7a1344d40690a72e073168160d0768a4 | |
| parent | e5c572f841b626b8b6f21a6966a33956d3b0b35b (diff) | |
Fix a problem creating the I2C bus for the SDVOC
interface, due to a name match with SDVOB.
Bus names must be unique.
| -rw-r--r-- | src/i830_sdvo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index 9a18f578..fe0c41a6 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -858,7 +858,10 @@ I830SDVOInit(ScrnInfoPtr pScrn, int output_index, CARD32 output_device) 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; |