---

yaml --- r: 122345 b: refs/heads/master c: 5256554 h: refs/heads/master i: 122343: eb3045d v: v3
git-mirror · Nov 26, 2008 · 3df8fc2 · 3df8fc2
1 parent c1de115
commit 3df8fc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a944f37364e22fff4cbc1e12d227b196e47612
+refs/heads/master: 5256554489531f3e177e7308752d8f0681cdd5a6
diff --git a/trunk/drivers/net/cxgb3/sge.c b/trunk/drivers/net/cxgb3/sge.c
@@ -549,16 +549,15 @@ static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
 
 	if (!p)
 		return NULL;
-	if (sw_size) {
+	if (sw_size && metadata) {
 		s = kcalloc(nelem, sw_size, GFP_KERNEL);
 
 		if (!s) {
 			dma_free_coherent(&pdev->dev, len, p, *phys);
 			return NULL;
 		}
-	}
-	if (metadata)
 		*(void **)metadata = s;
+	}
 	memset(p, 0, len);
 	return p;
 }