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

Commit 0f049375 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() 



[ Upstream commit a94371040712031ba129c7e9d8ff04a06a2f8207 ]

If an error occurs after a successful uvesafb_init_mtrr() call, it must be
undone by a corresponding arch_phys_wc_del() call, as already done in the
remove function.

This has been added in the remove function in commit 63e28a7a
("uvesafb: Clean up MTRR code")

Fixes: 8bdb3a2d ("uvesafb: the driver core")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3c9aaa58

drivers/video/fbdev/uvesafb.c

+1 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,7 @@ static int uvesafb_probe(struct platform_device *dev) 
out_unmap:

	iounmap(info->screen_base);

out_mem:

	arch_phys_wc_del(par->mtrr_handle);

	release_mem_region(info->fix.smem_start, info->fix.smem_len);

out_reg:

	release_region(0x3c0, 32);