From f6763588c2dcaa1076e930a069c9c4dfa82e3e05 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 27 Aug 2009 12:22:43 -0700
Subject: [PATCH] --- yaml --- r: 157150 b: refs/heads/master c:
 0a80fb10239b04c45e5e80aad8d4b2ca5ac407b2 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/video/xen-fbfront.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dde3a272254d..f4a37fb0cca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c504cadc443a3d002fa581ec5109c0ef02d7b14
+refs/heads/master: 0a80fb10239b04c45e5e80aad8d4b2ca5ac407b2
diff --git a/trunk/drivers/video/xen-fbfront.c b/trunk/drivers/video/xen-fbfront.c
index 15502d5e3641..54cd91610174 100644
--- a/trunk/drivers/video/xen-fbfront.c
+++ b/trunk/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;