Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...

minor set of nouveau fixes.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/bios: fix typo in error message
  drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP
  drm/nv50/fb: fix double free of vram mm
  drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
  drm/nouveau/pm: fix a typo related to the move to the therm subdev
  drm/nouveau/hwmon: fix the initialization condition

diff --combined drivers/gpu/drm/nouveau/nouveau_pm.c
index 0bf64c90aa206cc42879e2621a8da1f5481e7f4d,112d0deeb6d54547e6cb57f5bbf4adae28cabd54..5566172774df4b2ff891db4745483b8655754a5b
--- 1/drivers/gpu/drm/nouveau/nouveau_pm.c
--- 2/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@@ -29,7 -29,7 +29,7 @@@
  #include <linux/hwmon.h>
  #include <linux/hwmon-sysfs.h>
  
 -#include "drmP.h"
 +#include <drm/drmP.h>
  
  #include "nouveau_drm.h"
  #include "nouveau_pm.h"
@@@ -52,7 -52,7 +52,7 @@@ nouveau_pm_perflvl_aux(struct drm_devic
  {
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_pm *pm = nouveau_pm(dev);
-       struct nouveau_therm *therm = nouveau_therm(drm);
+       struct nouveau_therm *therm = nouveau_therm(drm->device);
        int ret;
  
        /*XXX: not on all boards, we should control based on temperature
@@@ -64,7 -64,6 +64,6 @@@
                ret = therm->fan_set(therm, perflvl->fanspeed);
                if (ret && ret != -ENODEV) {
                        NV_ERROR(drm, "fanspeed set failed: %d\n", ret);
-                       return ret;
                }
        }
  
@@@ -706,8 -705,7 +705,7 @@@ nouveau_hwmon_init(struct drm_device *d
        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);