---

yaml --- r: 315808 b: refs/heads/master c: ec2deec h: refs/heads/master v: v3
git-mirror · Jul 23, 2012 · 6f9353d · 6f9353d
1 parent 313cc32
commit 6f9353d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 818810472b129004c16fc51bf0a570b60776bfb7
+refs/heads/master: ec2deec1f3520c467e3fb64f11a5d1e9c073e376
diff --git a/trunk/drivers/net/ethernet/sun/niu.c b/trunk/drivers/net/ethernet/sun/niu.c
@@ -3335,6 +3335,10 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp,
 
 	addr = np->ops->map_page(np->device, page, 0,
 				 PAGE_SIZE, DMA_FROM_DEVICE);
+	if (!addr) {
+		__free_page(page);
+		return -ENOMEM;
+	}
 
 	niu_hash_page(rp, page, addr);
 	if (rp->rbr_blocks_per_page > 1)