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

Commit 951f4e97 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

fbdev: imxfb: warn about invalid left/right margin 



[ Upstream commit 4e47382fbca916d7db95cbf9e2d7ca2e9d1ca3fe ]

Warn about invalid var->left_margin or var->right_margin. Their values
are read from the device tree.

We store var->left_margin-3 and var->right_margin-1 in register
fields. These fields should be >= 0.

Fixes: 7e8549bc ("imxfb: Fix margin settings")
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3e03319a

drivers/video/fbdev/imxfb.c

+2 −2
Original line number Diff line number Diff line
@@ -601,10 +601,10 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf 
	if (var->hsync_len < 1    || var->hsync_len > 64)

		printk(KERN_ERR "%s: invalid hsync_len %d\n",

			info->fix.id, var->hsync_len);

	if (var->left_margin > 255)

	if (var->left_margin < 3  || var->left_margin > 255)

		printk(KERN_ERR "%s: invalid left_margin %d\n",

			info->fix.id, var->left_margin);

	if (var->right_margin > 255)

	if (var->right_margin < 1 || var->right_margin > 255)

		printk(KERN_ERR "%s: invalid right_margin %d\n",

			info->fix.id, var->right_margin);

	if (var->yres < 1 || var->yres > ymax_mask)