Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux.git] / drivers / net / xen-netback / interface.c

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 1c7f49b5acc17805f5983ed41839472fa8c8d5d8..83deeebfc2d194518a8eaf6a18970199e6fb9d31 100644 (file)
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -780,9 +780,8 @@ void xenvif_disconnect_ctrl(struct xenvif *vif)
                vif->ctrl_task = NULL;
        }
 
-       xenvif_deinit_hash(vif);
-
        if (vif->ctrl_irq) {
+               xenvif_deinit_hash(vif);
                unbind_from_irqhandler(vif->ctrl_irq, vif);
                vif->ctrl_irq = 0;
        }