| From 539a1d3df3ab8864fe344d3897a12cf633e3afee Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 10 Dec 2022 12:35:22 +0100 |
| Subject: fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ 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 63e28a7a5ffc |
| ("uvesafb: Clean up MTRR code") |
| |
| Fixes: 8bdb3a2d7df4 ("uvesafb: the driver core") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Signed-off-by: Helge Deller <deller@gmx.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/video/fbdev/uvesafb.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c |
| index 4df6772802d7..1f3b7e013568 100644 |
| --- a/drivers/video/fbdev/uvesafb.c |
| +++ b/drivers/video/fbdev/uvesafb.c |
| @@ -1758,6 +1758,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); |
| -- |
| 2.35.1 |
| |
