This code accidentally checks ->ctrl_base instead of ->mbox_base so the
error handling can never be triggered.

Fixes: a4123ffab9ec ("mailbox: mpfs: support new, syscon based, devicetree configuration")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/mailbox/mailbox-mpfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
index 4df546e3b7ea..d5d9effece97 100644
--- a/drivers/mailbox/mailbox-mpfs.c
+++ b/drivers/mailbox/mailbox-mpfs.c
@@ -251,7 +251,7 @@ static inline int mpfs_mbox_syscon_probe(struct mpfs_mbox *mbox, struct platform
 		return PTR_ERR(mbox->sysreg_scb);
 
 	mbox->mbox_base = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(mbox->ctrl_base))
+	if (IS_ERR(mbox->mbox_base))
 		return PTR_ERR(mbox->mbox_base);
 
 	return 0;
-- 
2.45.2

On Sat, Nov 30, 2024 at 01:07:23PM +0300, Dan Carpenter wrote:
> This code accidentally checks ->ctrl_base instead of ->mbox_base so the
> error handling can never be triggered.
> 
> Fixes: a4123ffab9ec ("mailbox: mpfs: support new, syscon based, devicetree configuration")

This got merged? Would have been nice to know about it Jassi, you
really should adopt some mechanism of informing people that you applied
their patches.

I had added a fix for this locally Dan after we discussed it previously,
but since this made it in without that:
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>  drivers/mailbox/mailbox-mpfs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
> index 4df546e3b7ea..d5d9effece97 100644
> --- a/drivers/mailbox/mailbox-mpfs.c
> +++ b/drivers/mailbox/mailbox-mpfs.c
> @@ -251,7 +251,7 @@ static inline int mpfs_mbox_syscon_probe(struct mpfs_mbox *mbox, struct platform
>  		return PTR_ERR(mbox->sysreg_scb);
>  
>  	mbox->mbox_base = devm_platform_ioremap_resource(pdev, 0);
> -	if (IS_ERR(mbox->ctrl_base))
> +	if (IS_ERR(mbox->mbox_base))
>  		return PTR_ERR(mbox->mbox_base);
>  
>  	return 0;
> -- 
> 2.45.2
>