diff --git a/[refs] b/[refs]
index f4d230bd12d8..a81bf2b2d3a3 100644
--- 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
index 8c726b7004d3..60d5c035d946 100644
--- 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)