diff options
| author | John Crispin <blogic@openwrt.org> | 2016-03-22 21:14:51 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2016-03-22 21:14:51 +0000 |
| commit | c7e9bc5376184af86f55987756e45600dcaf78d8 (patch) | |
| tree | 93a9b78674165c5eddbf555337f63d9d736b59af /target/linux/mediatek/patches-4.4/0052-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch | |
| parent | 79a34f9a653177bae5d94526ea1fb0f6ecbda5fe (diff) | |
| download | master-187ad058-c7e9bc5376184af86f55987756e45600dcaf78d8.tar.gz master-187ad058-c7e9bc5376184af86f55987756e45600dcaf78d8.tar.bz2 master-187ad058-c7e9bc5376184af86f55987756e45600dcaf78d8.zip | |
mediatek: update patches
fixes trgmii on old eco and adds nand support
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49066 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0052-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.4/0052-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.4/0052-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch b/target/linux/mediatek/patches-4.4/0052-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch new file mode 100644 index 0000000000..5e542916e0 --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0052-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch @@ -0,0 +1,32 @@ +From 7809955b6f4319773a5ef561a5e98c61dc891a47 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter <dan.carpenter@oracle.com> +Date: Tue, 15 Mar 2016 10:18:49 +0300 +Subject: [PATCH 52/66] net: mediatek: checking for IS_ERR() instead of NULL + +of_phy_connect() returns NULL on error, it never returns error pointers. + +Fixes: 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet') +Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +index ba3afa5..9759fe5 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -186,9 +186,9 @@ static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac, + + phydev = of_phy_connect(eth->netdev[mac->id], phy_node, + mtk_phy_link_adjust, 0, phy_mode); +- if (IS_ERR(phydev)) { ++ if (!phydev) { + dev_err(eth->dev, "could not connect to PHY\n"); +- return PTR_ERR(phydev); ++ return -ENODEV; + } + + dev_info(eth->dev, +-- +1.7.10.4 + |