---

yaml --- r: 116462 b: refs/heads/master c: 7ddfb65 h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · 94a790c · 94a790c
1 parent c83b910
commit 94a790c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c425cec64eb0c0d0dd7037c21a25585cbe3636c
+refs/heads/master: 7ddfb650c7ef7a33a5ef11c0fdf5b3d837a47dba
diff --git a/trunk/drivers/pci/intr_remapping.c b/trunk/drivers/pci/intr_remapping.c
@@ -76,9 +76,10 @@ static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq)
 	struct irq_desc *desc;
 	struct irq_2_iommu *irq_iommu;
 
-	desc = irq_to_desc(irq);
-
-	BUG_ON(!desc);
+	/*
+	 * alloc irq desc if not allocated already.
+	 */
+	desc = irq_to_desc_alloc(irq);
 
 	irq_iommu = desc->irq_2_iommu;
 
@@ -255,11 +256,8 @@ int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
 	struct irq_2_iommu *irq_iommu;
 
 	spin_lock(&irq_2_ir_lock);
-	irq_iommu = valid_irq_2_iommu(irq);
-	if (!irq_iommu) {
-		spin_unlock(&irq_2_ir_lock);
-		return -1;
-	}
+
+	irq_iommu = irq_2_iommu_alloc(irq);
 
 	irq_iommu->iommu = iommu;
 	irq_iommu->irte_index = index;