1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 4abb0b9ed653..3e6934d4bea8 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -562,26 +562,24 @@ static void xenfb_init_shared_page(struct xenfb_info *info,
 static int xenfb_connect_backend(struct xenbus_device *dev,
                                  struct xenfb_info *info)
 {
-        int ret, evtchn;
+        int ret, evtchn, irq;
         struct xenbus_transaction xbt;
 
         ret = xenbus_alloc_evtchn(dev, &evtchn);
         if (ret)
                 return ret;
-        ret = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler,
+        irq = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler,
                                         0, dev->devicetype, info);
-        if (ret < 0) {
+        if (irq < 0) {
                 xenbus_free_evtchn(dev, evtchn);
                 xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler");
-                return ret;
+                return irq;
         }
-        info->irq = ret;
-
  again:
         ret = xenbus_transaction_start(&xbt);
         if (ret) {
                 xenbus_dev_fatal(dev, ret, "starting transaction");
-                return ret;
+                goto unbind_irq;
         }
         ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu",
                             virt_to_mfn(info->page));
@@ -603,20 +601,25 @@ static int xenfb_connect_backend(struct xenbus_device *dev,
                 if (ret == -EAGAIN)
                         goto again;
                 xenbus_dev_fatal(dev, ret, "completing transaction");
-                return ret;
+                goto unbind_irq;
         }
 
         xenbus_switch_state(dev, XenbusStateInitialised);
+        info->irq = irq;
         return 0;
 
  error_xenbus:
         xenbus_transaction_end(xbt, 1);
         xenbus_dev_fatal(dev, ret, "writing xenstore");
+ unbind_irq:
+        unbind_from_irqhandler(irq, info);
         return ret;
 }
 
 static void xenfb_disconnect_backend(struct xenfb_info *info)
 {
+        /* Prevent xenfb refresh */
+        info->update_wanted = 0;
         if (info->irq >= 0)
                 unbind_from_irqhandler(info->irq, info);
         info->irq = -1;