]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/nouveau/hwmon: fix the initialization condition
authorMartin Peres <martin.peres@labri.fr>
Wed, 3 Oct 2012 22:28:21 +0000 (00:28 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 16 Oct 2012 06:28:55 +0000 (16:28 +1000)
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_pm.c

index b9d5335df74274d60837b59a2342418eb4fcae02..47677e3f8d7eb2c87ca2654e93434c7ac44a2281 100644 (file)
@@ -706,8 +706,7 @@ nouveau_hwmon_init(struct drm_device *dev)
        struct device *hwmon_dev;
        int ret = 0;
 
-       if (!therm || !therm->temp_get || !therm->attr_get ||
-               !therm->attr_set || therm->temp_get(therm) < 0)
+       if (!therm || !therm->temp_get || !therm->attr_get || !therm->attr_set)
                return -ENODEV;
 
        hwmon_dev = hwmon_device_register(&dev->pdev->dev);