Merge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / drivers / net / ethernet / allwinner / sun4i-emac.c

diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index bab01c84916549e7599e34fe7a1c15bf2d10b456..48ce83e443c2b12bbcbc2e2545c5ac6b1983f3d0 100644 (file)
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -28,6 +28,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/soc/sunxi/sunxi_sram.h>
 
 #include "sun4i-emac.h"
 
@@ -857,11 +858,17 @@ static int emac_probe(struct platform_device *pdev)
 
        clk_prepare_enable(db->clk);
 
+       ret = sunxi_sram_claim(&pdev->dev);
+       if (ret) {
+               dev_err(&pdev->dev, "Error couldn't map SRAM to device\n");
+               goto out;
+       }
+
        db->phy_node = of_parse_phandle(np, "phy", 0);
        if (!db->phy_node) {
                dev_err(&pdev->dev, "no associated PHY\n");
                ret = -ENODEV;
-               goto out;
+               goto out_release_sram;
        }
 
        /* Read MAC-address from DT */
@@ -893,7 +900,7 @@ static int emac_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(&pdev->dev, "Registering netdev failed!\n");
                ret = -ENODEV;
-               goto out;
+               goto out_release_sram;
        }
 
        dev_info(&pdev->dev, "%s: at %p, IRQ %d MAC: %pM\n",
@@ -901,6 +908,8 @@ static int emac_probe(struct platform_device *pdev)
 
        return 0;
 
+out_release_sram:
+       sunxi_sram_release(&pdev->dev);
 out:
        dev_err(db->dev, "not found (%d).\n", ret);