diff options
| author | Eric Anholt <eric@anholt.net> | 2006-12-01 10:37:19 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-12-01 13:29:08 -0800 |
| commit | 81dde11d419c8f9198ab3502d9813d66d0bc6d6d (patch) | |
| tree | d72a4a488c210b961bc498480be413041eeec15e | |
| parent | a504e31f0fefdec802ae403573f52fac3d577b65 (diff) | |
Fix copy'n'paste-o from restructure-outputs that resulted in crashes.
Our driver private is stored in the bus that we set up, not the DDC device
that xf86 code does.
| -rw-r--r-- | src/i830_sdvo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index aa061828..c75800d4 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -823,7 +823,7 @@ i830_sdvo_get_capabilities(xf86OutputPtr output, struct i830_sdvo_caps *caps) static Bool i830_sdvo_ddc_i2c_get_byte(I2CDevPtr d, I2CByte *data, Bool last) { - xf86OutputPtr output = d->DriverPrivate.ptr; + xf86OutputPtr output = d->pI2CBus->DriverPrivate.ptr; I830OutputPrivatePtr intel_output = output->driver_private; I2CBusPtr i2cbus = intel_output->pI2CBus, savebus; Bool ret; @@ -840,7 +840,7 @@ i830_sdvo_ddc_i2c_get_byte(I2CDevPtr d, I2CByte *data, Bool last) static Bool i830_sdvo_ddc_i2c_put_byte(I2CDevPtr d, I2CByte c) { - xf86OutputPtr output = d->DriverPrivate.ptr; + xf86OutputPtr output = d->pI2CBus->DriverPrivate.ptr; I830OutputPrivatePtr intel_output = output->driver_private; I2CBusPtr i2cbus = intel_output->pI2CBus, savebus; Bool ret; @@ -875,7 +875,7 @@ i830_sdvo_ddc_i2c_start(I2CBusPtr b, int timeout) static void i830_sdvo_ddc_i2c_stop(I2CDevPtr d) { - xf86OutputPtr output = d->DriverPrivate.ptr; + xf86OutputPtr output = d->pI2CBus->DriverPrivate.ptr; I830OutputPrivatePtr intel_output = output->driver_private; I2CBusPtr i2cbus = intel_output->pI2CBus, savebus; |