| Message ID | 20191011052436.76075-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c6b69bf143734a797b45e4728dc5ad80586d206c |
| Headers | show |
| Series | [-next] soc: ti: omap-prm: fix return value check in omap_prm_probe() | expand |
On 10/10/19 10:24 PM, Wei Yongjun wrote: > In case of error, the function devm_ioremap_resource() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Fixes: 3e99cb214f03 ("soc: ti: add initial PRM driver with reset control support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- Applied
diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c index db47a8bceb87..96c6f777519c 100644 --- a/drivers/soc/ti/omap_prm.c +++ b/drivers/soc/ti/omap_prm.c @@ -375,8 +375,8 @@ static int omap_prm_probe(struct platform_device *pdev) prm->data = data; prm->base = devm_ioremap_resource(&pdev->dev, res); - if (!prm->base) - return -ENOMEM; + if (IS_ERR(prm->base)) + return PTR_ERR(prm->base); return omap_prm_reset_init(pdev, prm); }
In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 3e99cb214f03 ("soc: ti: add initial PRM driver with reset control support") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/soc/ti/omap_prm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)