Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To:     spock@gentoo.org, adaplas@gmail.com, akpm@linux-foundation.org
Cc:     linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Subject: [PATCH] video: fbdev: uvesafb: Fixes an error handling path in 'uvesafb_probe()'
Date:   Sun,  6 Jun 2021 17:46:28 +0200
Message-Id: <dd2a4806d3a570ab84947806f38a494454fd0245.1622994310.git.christophe.jaillet@wanadoo.fr>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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>
---
Unsure about the Fixes tag, maybe it is 63e28a7a5ffc
---
 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..a7e606520dfc 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -1757,6 +1757,7 @@ static int uvesafb_probe(struct platform_device *dev)
 
 out_unmap:
 	iounmap(info->screen_base);
+	arch_phys_wc_del(par->mtrr_handle);
 out_mem:
 	release_mem_region(info->fix.smem_start, info->fix.smem_len);
 out_reg:
-- 
2.30.2