X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=drivers%2Fxen%2Fxenbus%2Fxenbus_dev_frontend.c;h=1e8be12ebb559880fa5d10f05a2782ad46c36be3;hb=aa34e07e457ed13b44d680b5b605e3e5a585f611;hp=c1010f018bd857985b5bf0ada1f5286f0f68b2bf;hpb=522533f338f38e15106d5f58901f38fe7bd6a7d8;p=cascardo%2Flinux.git

diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index c1010f018bd8..1e8be12ebb55 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -364,7 +364,7 @@ out:
 
 static int xenbus_write_watch(unsigned msg_type, struct xenbus_file_priv *u)
 {
-	struct watch_adapter *watch, *tmp_watch;
+	struct watch_adapter *watch;
 	char *path, *token;
 	int err, rc;
 	LIST_HEAD(staging_q);
@@ -399,7 +399,7 @@ static int xenbus_write_watch(unsigned msg_type, struct xenbus_file_priv *u)
 		}
 		list_add(&watch->list, &u->watches);
 	} else {
-		list_for_each_entry_safe(watch, tmp_watch, &u->watches, list) {
+		list_for_each_entry(watch, &u->watches, list) {
 			if (!strcmp(watch->token, token) &&
 			    !strcmp(watch->watch.node, path)) {
 				unregister_xenbus_watch(&watch->watch);