summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-08-27 12:22:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-27 12:31:18 -0700
commit0a80fb10239b04c45e5e80aad8d4b2ca5ac407b2 (patch)
tree580b0763d60546ab23953b376d2a9264b3e64bf2
parent9c504cadc443a3d002fa581ec5109c0ef02d7b14 (diff)
downloadlinux-3.10-0a80fb10239b04c45e5e80aad8d4b2ca5ac407b2.tar.gz
linux-3.10-0a80fb10239b04c45e5e80aad8d4b2ca5ac407b2.tar.bz2
linux-3.10-0a80fb10239b04c45e5e80aad8d4b2ca5ac407b2.zip
xenfb: connect to backend before registering fb
As soon as the framebuffer is registered, our methods may be called by the kernel. This leads to a crash as xenfb_refresh() gets called before we have the irq. Connect to the backend before registering our framebuffer with the kernel. [ Fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=14059 ] Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/xen-fbfront.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 15502d5e364..54cd9161017 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -454,6 +454,10 @@ 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;
+
ret = register_framebuffer(fb_info);
if (ret) {
fb_deferred_io_cleanup(fb_info);
@@ -464,10 +468,6 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
}
info->fb_info = fb_info;
- ret = xenfb_connect_backend(dev, info);
- if (ret < 0)
- goto error;
-
xenfb_make_preferred_console();
return 0;