diff options
| author | Martin Peres <martin.peres@labri.fr> | 2012-10-03 18:28:21 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-16 02:28:55 -0400 |
| commit | a5f5af8698a5cb3a68608a40a8782bdf8263cb97 (patch) | |
| tree | 984596590bbd4282cb5406585c811f72e20278e6 /drivers/gpu/drm/nouveau | |
| parent | 11573aa78858598cabedc472538998474b2e8efd (diff) | |
drm/nouveau/hwmon: fix the initialization condition
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index b9d5335df742..47677e3f8d7e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c | |||
| @@ -706,8 +706,7 @@ nouveau_hwmon_init(struct drm_device *dev) | |||
| 706 | struct device *hwmon_dev; | 706 | struct device *hwmon_dev; |
| 707 | int ret = 0; | 707 | int ret = 0; |
| 708 | 708 | ||
| 709 | if (!therm || !therm->temp_get || !therm->attr_get || | 709 | if (!therm || !therm->temp_get || !therm->attr_get || !therm->attr_set) |
| 710 | !therm->attr_set || therm->temp_get(therm) < 0) | ||
| 711 | return -ENODEV; | 710 | return -ENODEV; |
| 712 | 711 | ||
| 713 | hwmon_dev = hwmon_device_register(&dev->pdev->dev); | 712 | hwmon_dev = hwmon_device_register(&dev->pdev->dev); |