---

yaml --- r: 293891 b: refs/heads/master c: 5d7486c h: refs/heads/master i: 293889: d4982cf 293887: 53b5c2f v: v3
git-mirror · Mar 21, 2012 · 81e1f36 · 81e1f36
1 parent 2d2d0e5
commit 81e1f36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8848f759c0de139bada271aa446f48637c98ca1a
+refs/heads/master: 5d7486c77d44cb26049f599fdfa46bc548ea5537
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c
@@ -518,6 +518,9 @@ static int radeon_hwmon_init(struct radeon_device *rdev)
 	case THERMAL_TYPE_NI:
 	case THERMAL_TYPE_SUMO:
 	case THERMAL_TYPE_SI:
+		/* No support for TN yet */
+		if (rdev->family == CHIP_ARUBA)
+			return err;
 		rdev->pm.int_hwmon_dev = hwmon_device_register(rdev->dev);
 		if (IS_ERR(rdev->pm.int_hwmon_dev)) {
 			err = PTR_ERR(rdev->pm.int_hwmon_dev);