* [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe
@ 2016-03-22 23:06 Vladimir Zapolskiy
2016-03-23 9:00 ` Matthias Brugger
2016-03-23 17:50 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Vladimir Zapolskiy @ 2016-03-22 23:06 UTC (permalink / raw)
To: David S. Miller, Felix Fietkau, John Crispin
Cc: netdev, linux-arm-kernel, linux-mediatek
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(-)
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);
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe
2016-03-22 23:06 [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe Vladimir Zapolskiy
@ 2016-03-23 9:00 ` Matthias Brugger
2016-03-23 9:07 ` John Crispin
2016-03-23 17:50 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Matthias Brugger @ 2016-03-23 9:00 UTC (permalink / raw)
To: Vladimir Zapolskiy, David S. Miller, Felix Fietkau, John Crispin
Cc: netdev, linux-mediatek, linux-arm-kernel
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);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe
2016-03-23 9:00 ` Matthias Brugger
@ 2016-03-23 9:07 ` John Crispin
0 siblings, 0 replies; 4+ messages in thread
From: John Crispin @ 2016-03-23 9:07 UTC (permalink / raw)
To: Vladimir Zapolskiy
Cc: Matthias Brugger, David S. Miller, Felix Fietkau, netdev,
linux-mediatek, linux-arm-kernel
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);
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe
2016-03-22 23:06 [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe Vladimir Zapolskiy
2016-03-23 9:00 ` Matthias Brugger
@ 2016-03-23 17:50 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2016-03-23 17:50 UTC (permalink / raw)
To: vz; +Cc: nbd, blogic, netdev, linux-arm-kernel, linux-mediatek
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-23 17:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-22 23:06 [PATCH] net: mediatek: fix checking for NULL instead of IS_ERR() in .probe Vladimir Zapolskiy
2016-03-23 9:00 ` Matthias Brugger
2016-03-23 9:07 ` John Crispin
2016-03-23 17:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).