2022-06-06 06:10:27

by CGEL

Subject: [PATCH] [media] si2165: Remove redundant NULL check before release_firmware() call

From: Minghao Chi <[email protected]>

release_firmware() checks for NULL pointers internally so checking
before calling it is redundant.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
---
drivers/media/dvb-frontends/si2165.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index ebee230afb7b..3d167ca670a4 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -513,10 +513,8 @@ static int si2165_upload_firmware(struct si2165_state *state)
ret = 0;
state->firmware_loaded = true;
error:
- if (fw) {
- release_firmware(fw);
- fw = NULL;
- }
+ release_firmware(fw);
+ fw = NULL;

return ret;
}
--
2.25.1

2022-11-21 20:30:40

by Matthias Schwarzott

Subject: Re: [PATCH] [media] si2165: Remove redundant NULL check before release_firmware() call

Am 06.06.22 um 03:44 schrieb [email protected]:
> From: Minghao Chi <[email protected]>
>
> release_firmware() checks for NULL pointers internally so checking
> before calling it is redundant.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
> ---
> drivers/media/dvb-frontends/si2165.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
> index ebee230afb7b..3d167ca670a4 100644
> --- a/drivers/media/dvb-frontends/si2165.c
> +++ b/drivers/media/dvb-frontends/si2165.c
> @@ -513,10 +513,8 @@ static int si2165_upload_firmware(struct si2165_state *state)
> ret = 0;
> state->firmware_loaded = true;
> error:
> - if (fw) {
> - release_firmware(fw);
> - fw = NULL;
> - }
> + release_firmware(fw);
> + fw = NULL;
>
> return ret;
> }

Acked-by: Matthias Schwarzott <[email protected]>