| Message ID | 20190306072633.GA2625@kadam (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | mt76: Fix an IS_ERR() vs NULL check in mt76_wmac_probe() | expand |
Dan Carpenter <dan.carpenter@oracle.com> writes: > The devm_ioremap_resource() function never returns NULL, it returns > error pointers. > > Fixes: c8846e101502 ("mt76: add driver for MT7603E and MT7628/7688") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c > index e13fea80d970..b920be1f5718 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c > @@ -23,9 +23,9 @@ mt76_wmac_probe(struct platform_device *pdev) > } > > mem_base = devm_ioremap_resource(&pdev->dev, res); > - if (!mem_base) { > + if (IS_ERR(mem_base)) { > dev_err(&pdev->dev, "Failed to get memory resource\n"); > - return -EINVAL; > + return PTR_ERR(mem_base); > } Wei already posted an identical patch: https://patchwork.kernel.org/patch/10837285/
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c index e13fea80d970..b920be1f5718 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c @@ -23,9 +23,9 @@ mt76_wmac_probe(struct platform_device *pdev) } mem_base = devm_ioremap_resource(&pdev->dev, res); - if (!mem_base) { + if (IS_ERR(mem_base)) { dev_err(&pdev->dev, "Failed to get memory resource\n"); - return -EINVAL; + return PTR_ERR(mem_base); } mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt7603_ops,
The devm_ioremap_resource() function never returns NULL, it returns error pointers. Fixes: c8846e101502 ("mt76: add driver for MT7603E and MT7628/7688") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)