| From 0c0a28b6ee86e44b26d59116ff0fead240700cec Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 30 Nov 2024 13:07:39 +0300 |
| Subject: mailbox: th1520: Fix a NULL vs IS_ERR() bug |
| |
| From: Dan Carpenter <dan.carpenter@linaro.org> |
| |
| [ Upstream commit d0f98e14c010bcf27898b635a54c1994ac4110a8 ] |
| |
| The devm_ioremap() function doesn't return error pointers, it returns |
| NULL. Update the error checking to match. |
| |
| Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver") |
| Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> |
| Reviewed-by: Michal Wilczynski <m.wilczynski@samsung.com> |
| Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mailbox/mailbox-th1520.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mailbox/mailbox-th1520.c b/drivers/mailbox/mailbox-th1520.c |
| index 4e84640ac3b87..e16e7c85ee3cd 100644 |
| --- a/drivers/mailbox/mailbox-th1520.c |
| +++ b/drivers/mailbox/mailbox-th1520.c |
| @@ -387,8 +387,10 @@ static void __iomem *th1520_map_mmio(struct platform_device *pdev, |
| |
| mapped = devm_ioremap(&pdev->dev, res->start + offset, |
| resource_size(res) - offset); |
| - if (IS_ERR(mapped)) |
| + if (!mapped) { |
| dev_err(&pdev->dev, "Failed to map resource: %s\n", res_name); |
| + return ERR_PTR(-ENOMEM); |
| + } |
| |
| return mapped; |
| } |
| -- |
| 2.39.5 |
| |
