diff options
author | John Crispin <john@phrozen.org> | 2017-02-16 09:53:03 +0100 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2017-02-16 09:53:30 +0100 |
commit | 53f5d59fa17049d94a3992d1067ded1fa90f61f8 (patch) | |
tree | 5596104b74bfe2a96f1abdb2303314a40c74322b /target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch | |
parent | f885edef5a3bfcddcfe85732ee65c1d475c4a8f6 (diff) | |
download | upstream-53f5d59fa17049d94a3992d1067ded1fa90f61f8.tar.gz upstream-53f5d59fa17049d94a3992d1067ded1fa90f61f8.tar.bz2 upstream-53f5d59fa17049d94a3992d1067ded1fa90f61f8.zip |
mediatek: bump to v4.9
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 | 26 |
1 files changed, 0 insertions, 26 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 deleted file mode 100644 index 19cdbf0d3e..0000000000 --- a/target/linux/mediatek/patches-4.4/0082-net-next-mediatek-add-missing-return-code-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -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(+) - ---- 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_et - - 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); |