evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/fan: fix selection of fan speed when fan->get returns an error

Browse source 
fan->get returns int, but we write it to unsigned variable, and then check
whether it's >= 0 (it always is)

Found by smatch:
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c:61 nouveau_fan_update() warn: always true condition '(duty >= 0) => (0-u32max >= 0)'

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Marcin Slusarz 2013-01-27 15:51:09 +01:00 • committed by Ben Skeggs
parent cd897837ea
commit fc3109a2cb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
View file

@ -39,7 +39,7 @@ nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target)
struct nouveau_timer *ptimer = nouveau_timer(priv); struct nouveau_timer *ptimer = nouveau_timer(priv);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
u32 duty; int duty;
/* update target fan speed, restricting to allowed range */ /* update target fan speed, restricting to allowed range */
spin_lock_irqsave(&fan->lock, flags); spin_lock_irqsave(&fan->lock, flags);
@ -64,9 +64,9 @@ nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target)
* it is meant to bump the fan speed more incrementally * it is meant to bump the fan speed more incrementally
*/ */
if (duty < target) if (duty < target)
duty = min(duty + 3, (u32) target); duty = min(duty + 3, target);
else if (duty > target) else if (duty > target)
duty = max(duty - 3, (u32) target); duty = max(duty - 3, target);
} else { } else {
duty = target; duty = target;
} }