diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 14:30:51 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 14:30:51 -0700 |
| commit | accc3b4a572bba903a801a393532272727f83f5b (patch) | |
| tree | b6677755ec43793d5719246f51e27f0e9d12b6c0 /drivers/net/ethernet/mellanox/mlxbf_gige | |
| parent | 510bbf82f8dc36804114873d30ed1d0c8533af81 (diff) | |
| parent | 511cce163b75bc3933fa3de769a82bb7e8663f2b (diff) | |
| download | linux-stable-accc3b4a572bba903a801a393532272727f83f5b.tar.gz linux-stable-accc3b4a572bba903a801a393532272727f83f5b.tar.bz2 linux-stable-accc3b4a572bba903a801a393532272727f83f5b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxbf_gige')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c index 4aeb927c3715..aa780b1614a3 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c @@ -246,8 +246,8 @@ int mlxbf_gige_mdio_probe(struct platform_device *pdev, struct mlxbf_gige *priv) } priv->clk_io = devm_ioremap(dev, res->start, resource_size(res)); - if (IS_ERR(priv->clk_io)) - return PTR_ERR(priv->clk_io); + if (!priv->clk_io) + return -ENOMEM; mlxbf_gige_mdio_cfg(priv); |