1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 0ebbb1906c30..30899901aef5 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1935,14 +1935,14 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
 
         dev_dbg(&dev->dev, "%s\n", dev->nodename);
 
-        unregister_netdev(info->netdev);
-
         xennet_disconnect_backend(info);
 
-        del_timer_sync(&info->rx_refill_timer);
-
         xennet_sysfs_delif(info->netdev);
 
+        unregister_netdev(info->netdev);
+
+        del_timer_sync(&info->rx_refill_timer);
+
         free_percpu(info->stats);
 
         free_netdev(info->netdev);
@@ -1962,9 +1962,6 @@ static int __init netif_init(void)
         if (!xen_domain())
                 return -ENODEV;
 
-        if (xen_initial_domain())
-                return 0;
-
         if (xen_hvm_domain() && !xen_platform_pci_unplug)
                 return -ENODEV;
 
@@ -1977,9 +1974,6 @@ module_init(netif_init);
 
 static void __exit netif_exit(void)
 {
-        if (xen_initial_domain())
-                return;
-
         xenbus_unregister_driver(&netfront_driver);
 }
 module_exit(netif_exit);