summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-01-19 15:54:10 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-01-25 11:04:34 +1000
commitb26e72fbb58d3665a75b58679535a8e283da5a11 (patch)
treef31ec60a2e8e80cf9e496ed4deecefdf72ba3d15 /drivers/gpu
parent1c2a679aa99d4b9d01004863d72d818534d4ac54 (diff)
downloadtalos-op-linux-b26e72fbb58d3665a75b58679535a8e283da5a11.tar.gz
talos-op-linux-b26e72fbb58d3665a75b58679535a8e283da5a11.zip
drm/nouveau: probe for adt7473 before f75375
There's a reported case where probing for f75375 causes the system to hang completely, in this case there's an adt7473 at the same i2c address. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_temp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 7ecc4adc1e45..8d9968e1cba8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -265,8 +265,8 @@ nouveau_temp_probe_i2c(struct drm_device *dev)
struct i2c_board_info info[] = {
{ I2C_BOARD_INFO("w83l785ts", 0x2d) },
{ I2C_BOARD_INFO("w83781d", 0x2d) },
- { I2C_BOARD_INFO("f75375", 0x2e) },
{ I2C_BOARD_INFO("adt7473", 0x2e) },
+ { I2C_BOARD_INFO("f75375", 0x2e) },
{ I2C_BOARD_INFO("lm99", 0x4c) },
{ }
};
OpenPOWER on IntegriCloud