1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 7523719bf8a4..212a5c871bf4 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -432,7 +432,8 @@ static int __must_check xen_allocate_irq_dynamic(void)
 
         irq = irq_alloc_desc_from(first, -1);
 
-        xen_irq_init(irq);
+        if (irq >= 0)
+                xen_irq_init(irq);
 
         return irq;
 }
@@ -713,7 +714,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
         mutex_lock(&irq_mapping_update_lock);
 
         irq = xen_allocate_irq_dynamic();
-        if (irq == -1)
+        if (irq < 0)
                 goto out;
 
         irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
@@ -729,7 +730,7 @@ out:
 error_irq:
         mutex_unlock(&irq_mapping_update_lock);
         xen_free_irq(irq);
-        return -1;
+        return ret;
 }
 #endif
 
@@ -779,7 +780,7 @@ int xen_irq_from_pirq(unsigned pirq)
         mutex_lock(&irq_mapping_update_lock);
 
         list_for_each_entry(info, &xen_irq_list_head, list) {
-                if (info == NULL || info->type != IRQT_PIRQ)
+                if (info->type != IRQT_PIRQ)
                         continue;
                 irq = info->irq;
                 if (info->u.pirq.pirq == pirq)
@@ -1670,6 +1671,7 @@ void __init xen_init_IRQ(void)
 
         evtchn_to_irq = kcalloc(NR_EVENT_CHANNELS, sizeof(*evtchn_to_irq),
                                     GFP_KERNEL);
+        BUG_ON(!evtchn_to_irq);
         for (i = 0; i < NR_EVENT_CHANNELS; i++)
                 evtchn_to_irq[i] = -1;