Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / xen / evtchn.c

diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index dbc13e9..c93d59e 100644 (file)
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -269,6 +269,14 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port)
                                       u->name, (void *)(unsigned long)port);
        if (rc >= 0)
                rc = 0;
+       else {
+               /* bind failed, should close the port now */
+               struct evtchn_close close;
+               close.port = port;
+               if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
+                       BUG();
+               set_port_user(port, NULL);
+       }
 
        return rc;
 }
@@ -277,6 +285,8 @@ static void evtchn_unbind_from_user(struct per_user_data *u, int port)
 {
        int irq = irq_from_evtchn(port);
 
+       BUG_ON(irq < 0);
+
        unbind_from_irqhandler(irq, (void *)(unsigned long)port);
 
        set_port_user(port, NULL);