Julia Lawall
2012-Apr-22 09:57 UTC
[PATCH] drivers/video/xen-fbfront.c: add missing cleanup code
From: Julia Lawall <Julia.Lawall at lip6.fr>
The operations in the subsequent error-handling code appear to be also
useful here.
Signed-off-by: Julia Lawall <Julia.Lawall at lip6.fr>
---
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) {
Konrad Rzeszutek Wilk
2012-Apr-26 21:42 UTC
[Xen-devel] [PATCH] drivers/video/xen-fbfront.c: add missing cleanup code
On Sun, Apr 22, 2012 at 11:57:40AM +0200, Julia Lawall wrote:> From: Julia Lawall <Julia.Lawall at lip6.fr> > > The operations in the subsequent error-handling code appear to be also > useful here.How about doing it this way? Florian, are you OK me carrying this patch in my tree for Linus or would you prefer to do it? commit a833fb9973b47cb30d1086e73f20b62a425bcd85 Author: Julia Lawall <Julia.Lawall at lip6.fr> Date: Sun Apr 22 11:57:40 2012 +0200 drivers/video/xen-fbfront.c: add missing cleanup code The operations in the subsequent error-handling code appear to be also useful here. Signed-off-by: Julia Lawall <Julia.Lawall at lip6.fr> [v1: Collapse some of the error handling functions] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com> diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index cb4529c..aa42160 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c @@ -458,26 +458,31 @@ 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) - goto error; + if (ret < 0) { + xenbus_dev_fatal(dev, ret, "xenfb_connect_backend"); + goto error_fb; + } ret = register_framebuffer(fb_info); if (ret) { - fb_deferred_io_cleanup(fb_info); - fb_dealloc_cmap(&fb_info->cmap); - framebuffer_release(fb_info); xenbus_dev_fatal(dev, ret, "register_framebuffer"); - goto error; + goto error_fb; } info->fb_info = fb_info; xenfb_make_preferred_console(); return 0; - error_nomem: - ret = -ENOMEM; - xenbus_dev_fatal(dev, ret, "allocating device memory"); - error: +error_fb: + fb_deferred_io_cleanup(fb_info); + fb_dealloc_cmap(&fb_info->cmap); + framebuffer_release(fb_info); +error_nomem: + if (!ret) { + ret = -ENOMEM; + xenbus_dev_fatal(dev, ret, "allocating device memory"); + } +error: xenfb_remove(dev); return ret; }> > Signed-off-by: Julia Lawall <Julia.Lawall at lip6.fr> > > --- > 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) { > > > _______________________________________________ > Xen-devel mailing list > Xen-devel at lists.xen.org > http://lists.xen.org/xen-devel