| Message ID | 1458687964-9690-1-git-send-email-vz@mleia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 23/03/16 00:06, Vladimir Zapolskiy wrote: > devm_ioremap_resource() returns ERR_PTR() value on error, it never > returns NULL, fix it and propagate the returned error upwards. > > Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet") > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > --- Reviewed-by: Matthias Brugger <mbrugger@suse.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 7f2126b..e0b68af 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -1690,8 +1690,8 @@ static int mtk_probe(struct platform_device *pdev) > return -ENOMEM; > > eth->base = devm_ioremap_resource(&pdev->dev, res); > - if (!eth->base) > - return -EADDRNOTAVAIL; > + if (IS_ERR(eth->base)) > + return PTR_ERR(eth->base); > > spin_lock_init(ð->page_lock); > >
On 23/03/2016 10:00, Matthias Brugger wrote: > > > On 23/03/16 00:06, Vladimir Zapolskiy wrote: >> devm_ioremap_resource() returns ERR_PTR() value on error, it never >> returns NULL, fix it and propagate the returned error upwards. >> >> Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 >> ethernet") >> Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> >> --- > > Reviewed-by: Matthias Brugger <mbrugger@suse.com> > Acked-by: John Crispin <blogic@openwrt.org> Thanks for the fix ! >> 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 7f2126b..e0b68af 100644 >> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c >> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c >> @@ -1690,8 +1690,8 @@ static int mtk_probe(struct platform_device *pdev) >> return -ENOMEM; >> >> eth->base = devm_ioremap_resource(&pdev->dev, res); >> - if (!eth->base) >> - return -EADDRNOTAVAIL; >> + if (IS_ERR(eth->base)) >> + return PTR_ERR(eth->base); >> >> spin_lock_init(ð->page_lock); >> >>
From: Vladimir Zapolskiy <vz@mleia.com> Date: Wed, 23 Mar 2016 01:06:04 +0200 > devm_ioremap_resource() returns ERR_PTR() value on error, it never > returns NULL, fix it and propagate the returned error upwards. > > Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet") > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Applied, thanks.
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 7f2126b..e0b68af 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1690,8 +1690,8 @@ static int mtk_probe(struct platform_device *pdev) return -ENOMEM; eth->base = devm_ioremap_resource(&pdev->dev, res); - if (!eth->base) - return -EADDRNOTAVAIL; + if (IS_ERR(eth->base)) + return PTR_ERR(eth->base); spin_lock_init(ð->page_lock);
devm_ioremap_resource() returns ERR_PTR() value on error, it never returns NULL, fix it and propagate the returned error upwards. Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet") Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)