Revert "xen-netback: Check for hotplug-status existence before watching"

[uclinux-h8/linux.git] / drivers / net / xen-netback / xenbus.c

diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index 3fad58d..990360d 100644 (file)
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -824,15 +824,11 @@ static void connect(struct backend_info *be)
        xenvif_carrier_on(be->vif);
 
        unregister_hotplug_status_watch(be);
-       if (xenbus_exists(XBT_NIL, dev->nodename, "hotplug-status")) {
-               err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch,
-                                          NULL, hotplug_status_changed,
-                                          "%s/%s", dev->nodename,
-                                          "hotplug-status");
-               if (err)
-                       goto err;
+       err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, NULL,
+                                  hotplug_status_changed,
+                                  "%s/%s", dev->nodename, "hotplug-status");
+       if (!err)
                be->have_hotplug_status_watch = 1;
-       }
 
        netif_tx_wake_all_queues(be->vif->dev);