Skip to content

Commit 2bf9545

Browse files
Wang Xiaojunwsakernel
authored andcommitted
i2c: mlxbf: Fix the return check of devm_ioremap and ioremap
devm_ioremap and ioremap may return NULL which cannot be checked by IS_ERR. Signed-off-by: Wang Xiaojun <wangxiaojun11@huawei.com> Reported-by: Hulk Robot <hulkci@huawei.com> Acked-by: Khalil Blaiech <kblaiech@nvidia.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent c62dac0 commit 2bf9545

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/i2c/busses/i2c-mlxbf.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,9 +1258,9 @@ static int mlxbf_i2c_get_gpio(struct platform_device *pdev,
12581258
return -EFAULT;
12591259

12601260
gpio_res->io = devm_ioremap(dev, params->start, size);
1261-
if (IS_ERR(gpio_res->io)) {
1261+
if (!gpio_res->io) {
12621262
devm_release_mem_region(dev, params->start, size);
1263-
return PTR_ERR(gpio_res->io);
1263+
return -ENOMEM;
12641264
}
12651265

12661266
return 0;
@@ -1323,9 +1323,9 @@ static int mlxbf_i2c_get_corepll(struct platform_device *pdev,
13231323
return -EFAULT;
13241324

13251325
corepll_res->io = devm_ioremap(dev, params->start, size);
1326-
if (IS_ERR(corepll_res->io)) {
1326+
if (!corepll_res->io) {
13271327
devm_release_mem_region(dev, params->start, size);
1328-
return PTR_ERR(corepll_res->io);
1328+
return -ENOMEM;
13291329
}
13301330

13311331
return 0;
@@ -1717,9 +1717,9 @@ static int mlxbf_i2c_init_coalesce(struct platform_device *pdev,
17171717
return -EFAULT;
17181718

17191719
coalesce_res->io = ioremap(params->start, size);
1720-
if (IS_ERR(coalesce_res->io)) {
1720+
if (!coalesce_res->io) {
17211721
release_mem_region(params->start, size);
1722-
return PTR_ERR(coalesce_res->io);
1722+
return -ENOMEM;
17231723
}
17241724

17251725
priv->coalesce = coalesce_res;

0 commit comments

Comments
 (0)