diff options
| author | John Crispin <john@phrozen.org> | 2016-05-23 11:20:20 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-05-23 11:20:20 +0200 |
| commit | f5f173e2b794bd996fa6171bb6b18f13c4ed1e90 (patch) | |
| tree | 749ba954d2b50e43e9cc83777a0b61dc42734a52 /target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch | |
| parent | a39ac242cc3ec0c2d39342754d86ec97e9e4fb32 (diff) | |
| download | master-31e0f0ae-f5f173e2b794bd996fa6171bb6b18f13c4ed1e90.tar.gz master-31e0f0ae-f5f173e2b794bd996fa6171bb6b18f13c4ed1e90.tar.bz2 master-31e0f0ae-f5f173e2b794bd996fa6171bb6b18f13c4ed1e90.zip | |
mediatek: update patches
* fixes NAND
* adds latest ethernet patches
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch b/target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch new file mode 100644 index 0000000000..529290a62b --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch @@ -0,0 +1,31 @@ +From 51ca1e9f141499fd7c95bff5401215b706656754 Mon Sep 17 00:00:00 2001 +From: John Crispin <john@phrozen.org> +Date: Sat, 23 Apr 2016 09:06:05 +0200 +Subject: [PATCH 082/102] net-next: mediatek: add missing return code check + +The code fails to check if the scratch memory was properly allocated. Add +this check and return with an error if the allocation failed. + +Signed-off-by: Sean Wang <keyhaede@gmail.com> +Signed-off-by: John Crispin <john@phrozen.org> +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +index feedd5a..fefbf16 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -498,6 +498,9 @@ static int mtk_init_fq_dma(struct mtk_eth *eth) + + eth->scratch_head = kcalloc(cnt, MTK_QDMA_PAGE_SIZE, + GFP_KERNEL); ++ if (unlikely(!eth->scratch_head)) ++ return -ENOMEM; ++ + dma_addr = dma_map_single(eth->dev, + eth->scratch_head, cnt * MTK_QDMA_PAGE_SIZE, + DMA_FROM_DEVICE); +-- +1.7.10.4 + |