---

yaml --- r: 106960 b: refs/heads/master c: 538c29d h: refs/heads/master v: v3
git-mirror · Jul 18, 2008 · d7155f2 · d7155f2
1 parent 00b8cfa
commit d7155f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c
+refs/heads/master: 538c29d43ebdac2edcef96ac07982d2296a63077
diff --git a/trunk/kernel/dma-coherent.c b/trunk/kernel/dma-coherent.c
@@ -105,8 +105,7 @@ int dma_alloc_from_coherent(struct device *dev, ssize_t size,
 			*dma_handle = mem->device_base + (page << PAGE_SHIFT);
 			*ret = mem->virt_base + (page << PAGE_SHIFT);
 			memset(*ret, 0, size);
-		}
-		if (mem->flags & DMA_MEMORY_EXCLUSIVE)
+		} else if (mem->flags & DMA_MEMORY_EXCLUSIVE)
 			*ret = NULL;
 	}
 	return (mem != NULL);