Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc3109a2 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

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



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: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cd897837

drivers/gpu/drm/nouveau/core/subdev/therm/fan.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target) 
	struct nouveau_timer *ptimer = nouveau_timer(priv);

	unsigned long flags;

	int ret = 0;

	u32 duty;

	int duty;



	/* update target fan speed, restricting to allowed range */

	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

		 */

		if (duty < target)

			duty = min(duty + 3, (u32) target);

			duty = min(duty + 3, target);

		else if (duty > target)

			duty = max(duty - 3, (u32) target);

			duty = max(duty - 3, target);

	} else {

		duty = target;

	}