git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
xen
/
tpmback
/
xenbus.c
diff --git
a/drivers/xen/tpmback/xenbus.c
b/drivers/xen/tpmback/xenbus.c
index
cb72a2e
..
4ee5c5b
100644
(file)
--- a/
drivers/xen/tpmback/xenbus.c
+++ b/
drivers/xen/tpmback/xenbus.c
@@
-34,7
+34,6
@@
struct backend_info
/* watch front end for changes */
struct xenbus_watch backend_watch;
/* watch front end for changes */
struct xenbus_watch backend_watch;
- enum xenbus_state frontend_state;
};
static void maybe_connect(struct backend_info *be);
};
static void maybe_connect(struct backend_info *be);
@@
-143,8
+142,6
@@
static void frontend_changed(struct xenbus_device *dev,
struct backend_info *be = dev->dev.driver_data;
int err;
struct backend_info *be = dev->dev.driver_data;
int err;
- be->frontend_state = frontend_state;
-
switch (frontend_state) {
case XenbusStateInitialising:
case XenbusStateInitialised:
switch (frontend_state) {
case XenbusStateInitialising:
case XenbusStateInitialised:
@@
-162,13
+159,12
@@
static void frontend_changed(struct xenbus_device *dev,
be->instance = -1;
break;
be->instance = -1;
break;
+ case XenbusStateUnknown:
case XenbusStateClosed:
device_unregister(&be->dev->dev);
tpmback_remove(dev);
break;
case XenbusStateClosed:
device_unregister(&be->dev->dev);
tpmback_remove(dev);
break;
- case XenbusStateUnknown:
- case XenbusStateInitWait:
default:
xenbus_dev_fatal(dev, -EINVAL,
"saw state %d at frontend",
default:
xenbus_dev_fatal(dev, -EINVAL,
"saw state %d at frontend",