diff options
| author |   Antonino A. Daplas <adaplas@gmail.com> | 2007-10-16 01:29:36 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:20 -0700 |
| commit | 076a7dce9ac3d89ef7215eecc1230177891383bd (patch) | |
| tree | 04438720ff7d9926762673e83e974fa4507b8fbc /drivers/video | |
| parent | vt/vgacon: Check if screen resize request comes from userspace (diff) | |
| download | linux-dev-076a7dce9ac3d89ef7215eecc1230177891383bd.tar.xz linux-dev-076a7dce9ac3d89ef7215eecc1230177891383bd.zip | |
nvidiafb: Correctly assign the i2c class with the port reversal
If the i2c ports are to be reversed, I2C_CLASS_HWMON assignment must also be
reversed.
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/nvidia/nv_i2c.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c index 0cbcb3d833fb..6fd7cb8f9b8e 100644 --- a/drivers/video/nvidia/nv_i2c.c +++ b/drivers/video/nvidia/nv_i2c.c @@ -126,10 +126,12 @@ void nvidia_create_i2c_busses(struct nvidia_par *par) par->chan[2].par = par; par->chan[0].ddc_base = (par->reverse_i2c) ? 0x36 : 0x3e; - nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", 0); + nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", + (par->reverse_i2c) ? I2C_CLASS_HWMON : 0); par->chan[1].ddc_base = (par->reverse_i2c) ? 0x3e : 0x36; - nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", I2C_CLASS_HWMON); + nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", + (par->reverse_i2c) ? 0 : I2C_CLASS_HWMON); par->chan[2].ddc_base = 0x50; nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2", 0); |