diff mbox

[1/1] ALSA: echoaudio: Deletion of a check before release_and_free_resource()

Message ID 547DF911.9040008@users.sourceforge.net (mailing list archive)
State Accepted
Commit 057a4a55e703038d22bc9f2bcf8b02dc35850e16
Headers show

Commit Message

SF Markus Elfring Dec. 2, 2014, 5:38 p.m. UTC
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 2 Dec 2014 18:34:45 +0100

The release_and_free_resource() function tests whether its argument is NULL
and then returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/pci/echoaudio/echoaudio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Takashi Iwai Dec. 2, 2014, 5:40 p.m. UTC | #1
At Tue, 02 Dec 2014 18:38:25 +0100,
SF Markus Elfring wrote:
> 
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 2 Dec 2014 18:34:45 +0100
> 
> The release_and_free_resource() function tests whether its argument is NULL
> and then returns immediately. Thus the test around the call is not needed.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Thanks, applied.


Takashi

> ---
>  sound/pci/echoaudio/echoaudio.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
> index 60e4003..21228ad 100644
> --- a/sound/pci/echoaudio/echoaudio.c
> +++ b/sound/pci/echoaudio/echoaudio.c
> @@ -1875,8 +1875,7 @@ static int snd_echo_free(struct echoaudio *chip)
>  	if (chip->dsp_registers)
>  		iounmap(chip->dsp_registers);
>  
> -	if (chip->iores)
> -		release_and_free_resource(chip->iores);
> +	release_and_free_resource(chip->iores);
>  
>  
>  	pci_disable_device(chip->pci);
> -- 
> 2.1.3
>
diff mbox

Patch

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 60e4003..21228ad 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1875,8 +1875,7 @@  static int snd_echo_free(struct echoaudio *chip)
 	if (chip->dsp_registers)
 		iounmap(chip->dsp_registers);
 
-	if (chip->iores)
-		release_and_free_resource(chip->iores);
+	release_and_free_resource(chip->iores);
 
 
 	pci_disable_device(chip->pci);