[PATCH] firmware: google: Unregister driver_info on failure

[PATCH] firmware: google: Unregister driver_info on failure

[Yuan Can]

When platform_device_register_full() returns error, the gsmi_init() returns
without unregister gsmi_driver_info, fix by add missing
platform_driver_unregister() when platform_device_register_full() failed.

Fixes: 8942b2d5094b ("gsmi: Add GSMI commands to log S0ix info")
Signed-off-by: Yuan Can <yuancan@huawei.com>
---
 drivers/firmware/google/gsmi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
index d304913314e4..24e666d5c3d1 100644
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
@@ -918,7 +918,8 @@ static __init int gsmi_init(void)
 	gsmi_dev.pdev = platform_device_register_full(&gsmi_dev_info);
 	if (IS_ERR(gsmi_dev.pdev)) {
 		printk(KERN_ERR "gsmi: unable to register platform device\n");
-		return PTR_ERR(gsmi_dev.pdev);
+		ret = PTR_ERR(gsmi_dev.pdev);
+		goto out_unregister;
 	}
 
 	/* SMI access needs to be serialized */
@@ -1056,10 +1057,11 @@ static __init int gsmi_init(void)
 	gsmi_buf_free(gsmi_dev.name_buf);
 	kmem_cache_destroy(gsmi_dev.mem_pool);
 	platform_device_unregister(gsmi_dev.pdev);
-	pr_info("gsmi: failed to load: %d\n", ret);
+out_unregister:
 #ifdef CONFIG_PM
 	platform_driver_unregister(&gsmi_driver_info);
 #endif
+	pr_info("gsmi: failed to load: %d\n", ret);
 	return ret;
 }
 
-- 
2.17.1

Re: [PATCH] firmware: google: Unregister driver_info on failure

[Greg KH]

On Tue, Oct 15, 2024 at 09:13:44PM +0800, Yuan Can wrote:
> When platform_device_register_full() returns error, the gsmi_init() returns
> without unregister gsmi_driver_info, fix by add missing
> platform_driver_unregister() when platform_device_register_full() failed.
> 
> Fixes: 8942b2d5094b ("gsmi: Add GSMI commands to log S0ix info")
> Signed-off-by: Yuan Can <yuancan@huawei.com>
> ---
>  drivers/firmware/google/gsmi.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
> index d304913314e4..24e666d5c3d1 100644
> --- a/drivers/firmware/google/gsmi.c
> +++ b/drivers/firmware/google/gsmi.c
> @@ -918,7 +918,8 @@ static __init int gsmi_init(void)
>  	gsmi_dev.pdev = platform_device_register_full(&gsmi_dev_info);
>  	if (IS_ERR(gsmi_dev.pdev)) {
>  		printk(KERN_ERR "gsmi: unable to register platform device\n");
> -		return PTR_ERR(gsmi_dev.pdev);
> +		ret = PTR_ERR(gsmi_dev.pdev);
> +		goto out_unregister;
>  	}
>  
>  	/* SMI access needs to be serialized */
> @@ -1056,10 +1057,11 @@ static __init int gsmi_init(void)
>  	gsmi_buf_free(gsmi_dev.name_buf);
>  	kmem_cache_destroy(gsmi_dev.mem_pool);
>  	platform_device_unregister(gsmi_dev.pdev);
> -	pr_info("gsmi: failed to load: %d\n", ret);
> +out_unregister:
>  #ifdef CONFIG_PM
>  	platform_driver_unregister(&gsmi_driver_info);
>  #endif
> +	pr_info("gsmi: failed to load: %d\n", ret);
>  	return ret;
>  }
>  
> -- 
> 2.17.1
> 

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
a patch that has triggered this response.  He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created.  Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.

You are receiving this message because of the following common error(s)
as indicated below:

- You have marked a patch with a "Fixes:" tag for a commit that is in an
  older released kernel, yet you do not have a cc: stable line in the
  signed-off-by area at all, which means that the patch will not be
  applied to any older kernel releases.  To properly fix this, please
  follow the documented rules in the
  Documentation/process/stable-kernel-rules.rst file for how to resolve
  this.

If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.

thanks,

greg k-h's patch email bot

Re: [PATCH] firmware: google: Unregister driver_info on failure

[Brian Norris]

On Tue, Oct 15, 2024 at 09:13:44PM +0800, Yuan Can wrote:
> When platform_device_register_full() returns error, the gsmi_init() returns
> without unregister gsmi_driver_info, fix by add missing
> platform_driver_unregister() when platform_device_register_full() failed.
> 
> Fixes: 8942b2d5094b ("gsmi: Add GSMI commands to log S0ix info")
> Signed-off-by: Yuan Can <yuancan@huawei.com>

Acked-by: Brian Norris <briannorris@chromium.org>

Re: [PATCH] firmware: google: Unregister driver_info on failure

[Tzung-Bi Shih]

On Tue, Oct 15, 2024 at 09:13:44PM +0800, Yuan Can wrote:
> When platform_device_register_full() returns error, the gsmi_init() returns
> without unregister gsmi_driver_info, fix by add missing
> platform_driver_unregister() when platform_device_register_full() failed.
> 
> [...]

Applied to

    https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git for-firmware-next

[1/1] firmware: google: Unregister driver_info on failure
      commit: 32b0901e141f6d4cf49d820b53eb09b88b1f72f7

Thanks!