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

Commit 3affd4cc authored by Aleksandr Burakov's avatar Aleksandr Burakov Committed by Greg Kroah-Hartman
Browse files

fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2 



[ Upstream commit bc87bb342f106a0402186bcb588fcbe945dced4b ]

There are some actions with value 'tmp' but 'dst_addr' is checked instead.
It is obvious that a copy-paste error was made here and the value
of variable 'tmp' should be checked here.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: default avatarAleksandr Burakov <a.burakov@rosalinux.ru>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f90519f1

drivers/video/fbdev/via/accel.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height, 


	if (op != VIA_BITBLT_FILL) {

		tmp = src_mem ? 0 : src_addr;

		if (dst_addr & 0xE0000007) {

		if (tmp & 0xE0000007) {

			printk(KERN_WARNING "hw_bitblt_1: Unsupported source "

				"address %X\n", tmp);

			return -EINVAL;
@@ -274,7 +274,7 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height, 
		writel(tmp, engine + 0x18);



		tmp = src_mem ? 0 : src_addr;

		if (dst_addr & 0xE0000007) {

		if (tmp & 0xE0000007) {

			printk(KERN_WARNING "hw_bitblt_2: Unsupported source "

				"address %X\n", tmp);

			return -EINVAL;