summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandr Burakov <a.burakov@rosalinux.ru>2024-03-01 14:35:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-13 12:50:16 +0200
commit3affd4cceebd560aa13c280fe0ad46a38e46eb73 (patch)
treefb4ef9f39d7081c0f3486c9a50e21bc141595d4f
parentf90519f1d6a0c4d86bcd401f34bda11486fa4284 (diff)
downloadlinux-stable-3affd4cceebd560aa13c280fe0ad46a38e46eb73.tar.gz
linux-stable-3affd4cceebd560aa13c280fe0ad46a38e46eb73.tar.bz2
linux-stable-3affd4cceebd560aa13c280fe0ad46a38e46eb73.zip
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: Aleksandr Burakov <a.burakov@rosalinux.ru> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/video/fbdev/via/accel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/via/accel.c b/drivers/video/fbdev/via/accel.c
index eb3615c69987..f542b01568df 100644
--- a/drivers/video/fbdev/via/accel.c
+++ b/drivers/video/fbdev/via/accel.c
@@ -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;