diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2018-06-11 19:52:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-13 00:36:14 +0200 |
| commit | 760a6ed6b6f29c48f97ff5a94ba0dbc639a2e677 (patch) | |
| tree | a9398f83e01a5ec0dd75b3a0f3077b1f61ae2a28 /drivers | |
| parent | tc-testing: ife: fix wrong teardown command in test b7b8 (diff) | |
| download | linux-760a6ed6b6f29c48f97ff5a94ba0dbc639a2e677.tar.xz linux-760a6ed6b6f29c48f97ff5a94ba0dbc639a2e677.zip | |
net: stmmac: dwmac-meson8b: Fix an error handling path in 'meson8b_dwmac_probe()'
If 'of_device_get_match_data()' fails, we need to release some resources as
done in the other error handling path of this function.
Fixes: efacb568c962 ("net: stmmac: dwmac-meson: extend phy mode setting")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index 4ff231df7322..c5979569fd60 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -334,9 +334,10 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) dwmac->data = (const struct meson8b_dwmac_data *) of_device_get_match_data(&pdev->dev); - if (!dwmac->data) - return -EINVAL; - + if (!dwmac->data) { + ret = -EINVAL; + goto err_remove_config_dt; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 1); dwmac->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(dwmac->regs)) { |