Index: root/xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
===================================================================
--- root.orig/xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
+++ root/xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
@@ -334,12 +334,6 @@ again:
 		goto abort_transaction;
 	}
 
-	err = xenbus_printf(xbt, dev->nodename,
-	                    "state", "%d", XenbusStateInitialised);
-	if (err) {
-		goto abort_transaction;
-	}
-
 	err = xenbus_transaction_end(xbt, 0);
 	if (err == -EAGAIN)
 		goto again;
@@ -347,6 +341,9 @@ again:
 		xenbus_dev_fatal(dev, err, "completing transaction");
 		goto destroy_tpmring;
 	}
+
+	xenbus_switch_state(dev, XenbusStateConnected);
+
 	return 0;
 
 abort_transaction:
@@ -387,6 +384,7 @@ static void backend_changed(struct xenbu
 		if (tp->is_suspended == 0) {
 			device_unregister(&dev->dev);
 		}
+		xenbus_switch_state(dev, XenbusStateClosed);
 		break;
 	}
 }
@@ -439,6 +437,7 @@ static int tpmfront_suspend(struct xenbu
 
 	/* lock, so no app can send */
 	mutex_lock(&suspend_lock);
+	xenbus_switch_state(dev, XenbusStateClosed);
 	tp->is_suspended = 1;
 
 	for (ctr = 0; atomic_read(&tp->tx_busy) && ctr <= 25; ctr++) {
Index: root/xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
===================================================================
--- root.orig/xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
+++ root/xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
@@ -164,10 +164,10 @@ static void frontend_changed(struct xenb
 
 	switch (frontend_state) {
 	case XenbusStateInitialising:
-	case XenbusStateConnected:
+	case XenbusStateInitialised:
 		break;
 
-	case XenbusStateInitialised:
+	case XenbusStateConnected:
 		err = connect_ring(be);
 		if (err) {
 			return;