Ilia Mirkin
2013-Nov-27 17:38 UTC
[Nouveau] [PATCH] drm/nouveau/hwmon: fix compilation without CONFIG_HWMON
Reported-by: Jim Davis <jim.epost at gmail.com> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- drivers/gpu/drm/nouveau/nouveau_hwmon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c index 38a4db5..4aff04f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c @@ -630,7 +630,6 @@ error: hwmon->hwmon = NULL; return ret; #else - hwmon->hwmon = NULL; return 0; #endif } -- 1.8.3.2
Jim Davis
2013-Nov-27 21:40 UTC
[Nouveau] [PATCH] drm/nouveau/hwmon: fix compilation without CONFIG_HWMON
2013/11/27 Ilia Mirkin <imirkin at alum.mit.edu>:> Reported-by: Jim Davis <jim.epost at gmail.com> > Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> > --- > drivers/gpu/drm/nouveau/nouveau_hwmon.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c > index 38a4db5..4aff04f 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c > +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c > @@ -630,7 +630,6 @@ error: > hwmon->hwmon = NULL; > return ret; > #else > - hwmon->hwmon = NULL; > return 0; > #endif > }I reran a configuration that had failed with that error with today's linux-next, and with the change it worked just fine. Tested-by: jim.epost at gmail.com Jim
Reasonably Related Threads
- [PATCH 3/3] hwmon: expose power_max and power_crit
- [PATCH] hwmon: return EINVAL if the GPU is powered down for sensors reads
- [PATCH] drm/nouveau: fix temp/pwm visibility, skip hwmon when no sensors exist
- [PATCH v4 4/6] hwmon: add power consumption
- RFC [PATCH 0/3] Expose power budget cap via hwmon