fbdev: hpfb: Fix an error handling path in hpfb_dio_probe()

[ Upstream commit aa578e897520f32ae12bec487f2474357d01ca9c ]

If an error occurs after request_mem_region(), a corresponding
release_mem_region() should be called, as already done in the remove
function.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
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>

diff --git a/drivers/video/fbdev/hpfb.c b/drivers/video/fbdev/hpfb.c
index 66fac8e5393e08851f3d120334345dee1629842c..a1144b15098266c4d91de0b4cf5fdcd5bf35f913 100644 (file)
--- a/drivers/video/fbdev/hpfb.c
+++ b/drivers/video/fbdev/hpfb.c
@@ -345,6 +345,7 @@ static int hpfb_dio_probe(struct dio_dev *d, const struct dio_device_id *ent)
        if (hpfb_init_one(paddr, vaddr)) {
                if (d->scode >= DIOII_SCBASE)
                        iounmap((void *)vaddr);
+               release_mem_region(d->resource.start, resource_size(&d->resource));
                return -ENOMEM;
        }
        return 0;