From 3633f769698b1b5c48b97ac4943a179b2dea07f2 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Mon, 5 Mar 2012 17:11:31 +0000
Subject: [PATCH] --- yaml --- r: 293983 b: refs/heads/master c:
 bd0d5aa417d40d6b996fb7b5c926bcecd56c8984 h: refs/heads/master i:   293981:
 074a50857098ee1c308aed5169c74ce3177504ea   293979:
 54e3a017ee396b3489550e63d6d438d9b2ba160a   293975:
 a121ff0571c867613928f6e73e89f420c7aca880   293967:
 2fa34bff1c98a809ca2b3585b8f0cd85f2aa918e   293951:
 a0b6489be67839c718cfc4e88dbc13c2444a2dcd v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/xen/xenbus/xenbus_probe.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6e30f5e6094..52b164339e51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73c154c60be106b47f15d1111fc2d75cc7a436f2
+refs/heads/master: bd0d5aa417d40d6b996fb7b5c926bcecd56c8984
diff --git a/trunk/drivers/xen/xenbus/xenbus_probe.c b/trunk/drivers/xen/xenbus/xenbus_probe.c
index 3864967202b5..b793723e724d 100644
--- a/trunk/drivers/xen/xenbus/xenbus_probe.c
+++ b/trunk/drivers/xen/xenbus/xenbus_probe.c
@@ -257,11 +257,12 @@ int xenbus_dev_remove(struct device *_dev)
 	DPRINTK("%s", dev->nodename);
 
 	free_otherend_watch(dev);
-	free_otherend_details(dev);
 
 	if (drv->remove)
 		drv->remove(dev);
 
+	free_otherend_details(dev);
+
 	xenbus_switch_state(dev, XenbusStateClosed);
 	return 0;
 }