---

yaml --- r: 161370 b: refs/heads/master c: 91b8e30 h: refs/heads/master v: v3
git-mirror · Aug 3, 2009 · 2136536 · 2136536
1 parent 1f184e3
commit 2136536
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2980d8c2961113f24863f70d8ad016f55224c81
+refs/heads/master: 91b8e3056bf9107b688eb076c9b804171364db71
diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c
@@ -196,6 +196,18 @@ static void intel_agp_unmap_page(struct page *page, dma_addr_t dma)
 		       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 }
 
+static void intel_agp_free_sglist(struct agp_memory *mem)
+{
+
+	if (mem->sg_vmalloc_flag)
+		vfree(mem->sg_list);
+	else
+		kfree(mem->sg_list);
+	mem->sg_vmalloc_flag = 0;
+	mem->sg_list = NULL;
+	mem->num_sg = 0;
+}
+
 static int intel_agp_map_memory(struct agp_memory *mem)
 {
 	struct scatterlist *sg;
@@ -224,13 +236,8 @@ static int intel_agp_map_memory(struct agp_memory *mem)
 
 	mem->num_sg = pci_map_sg(intel_private.pcidev, mem->sg_list,
 				 mem->page_count, PCI_DMA_BIDIRECTIONAL);
-	if (!mem->num_sg) {
-		if (mem->sg_vmalloc_flag)
-			vfree(mem->sg_list);
-		else
-			kfree(mem->sg_list);
-		mem->sg_list = NULL;
-		mem->sg_vmalloc_flag = 0;
+	if (unlikely(!mem->num_sg)) {
+		intel_agp_free_sglist(mem);
 		return -ENOMEM;
 	}
 	return 0;
@@ -242,13 +249,7 @@ static void intel_agp_unmap_memory(struct agp_memory *mem)
 
 	pci_unmap_sg(intel_private.pcidev, mem->sg_list,
 		     mem->page_count, PCI_DMA_BIDIRECTIONAL);
-	if (mem->sg_vmalloc_flag)
-		vfree(mem->sg_list);
-	else
-		kfree(mem->sg_list);
-	mem->sg_vmalloc_flag = 0;
-	mem->sg_list = NULL;
-	mem->num_sg = 0;
+	intel_agp_free_sglist(mem);
 }
 
 static void intel_agp_insert_sg_entries(struct agp_memory *mem,