[PATCH] drivers/video/xen-fbfront.c: add missing cleanup code

From: Julia Lawall
Date: Sun Apr 22 2012 - 05:58:07 EST


From: Julia Lawall <Julia.Lawall@xxxxxxx>

The operations in the subsequent error-handling code appear to be also
useful here.

Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>

---
Not tested.

drivers/video/xen-fbfront.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index cb4529c..b0bd59c 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -458,8 +458,13 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
xenfb_init_shared_page(info, fb_info);

ret = xenfb_connect_backend(dev, info);
- if (ret < 0)
+ if (ret < 0) {
+ fb_deferred_io_cleanup(fb_info);
+ fb_dealloc_cmap(&fb_info->cmap);
+ framebuffer_release(fb_info);
+ xenbus_dev_fatal(dev, ret, "xenfb_connect_backend");
goto error;
+ }

ret = register_framebuffer(fb_info);
if (ret) {

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/