Merge tag 'mmc-v4.5-rc1' of git://git.linaro.org/people/ulf.hansson/mmc

[karo-tx-linux.git] / drivers / net / ethernet / broadcom / bgmac.c

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index c7798d360512363f3e18f0e3e3dd1cdef5d4fc7f..06f6cffdfaf54a6dd56209f2ae9ac38c6f508fc4 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -466,6 +466,11 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,
                        len -= ETH_FCS_LEN;
 
                        skb = build_skb(buf, BGMAC_RX_ALLOC_SIZE);
+                       if (unlikely(!skb)) {
+                               bgmac_err(bgmac, "build_skb failed\n");
+                               put_page(virt_to_head_page(buf));
+                               break;
+                       }
                        skb_put(skb, BGMAC_RX_FRAME_OFFSET +
                                BGMAC_RX_BUF_OFFSET + len);
                        skb_pull(skb, BGMAC_RX_FRAME_OFFSET +