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

Commit 46ffe109 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Tomi Valkeinen
Browse files

video: fbdev: imxfb: fix semantic of .get_power and .set_power 



.set_power gets passed an FB_BLANK_XXX value, not a bool. So 0 signals
on; and >1 means off. The same applies for return values of .get_power.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 9b4639bb

drivers/video/fbdev/imxfb.c

+5 −4
Original line number Diff line number Diff line
@@ -758,10 +758,11 @@ static int imxfb_lcd_get_power(struct lcd_device *lcddev) 
{

	struct imxfb_info *fbi = dev_get_drvdata(&lcddev->dev);



	if (!IS_ERR(fbi->lcd_pwr))

		return regulator_is_enabled(fbi->lcd_pwr);

	if (!IS_ERR(fbi->lcd_pwr) &&

	    !regulator_is_enabled(fbi->lcd_pwr))

		return FB_BLANK_POWERDOWN;



	return 1;

	return FB_BLANK_UNBLANK;

}



static int imxfb_lcd_set_power(struct lcd_device *lcddev, int power)
@@ -769,7 +770,7 @@ static int imxfb_lcd_set_power(struct lcd_device *lcddev, int power) 
	struct imxfb_info *fbi = dev_get_drvdata(&lcddev->dev);



	if (!IS_ERR(fbi->lcd_pwr)) {

		if (power)

		if (power == FB_BLANK_UNBLANK)

			return regulator_enable(fbi->lcd_pwr);

		else

			return regulator_disable(fbi->lcd_pwr);