[2/2] ALSA: fireworks: small leak on error path
diff mbox

Message ID 20140528164246.GC1824@mwanda
State Accepted
Commit 396178370b9dc20275811dcc3b607c5af70689ba
Headers show

Commit Message

Dan Carpenter May 28, 2014, 4:42 p.m. UTC
There was a typo here so we return directly instead of freeing "hwinfo".

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Takashi Sakamoto May 28, 2014, 9:57 p.m. UTC | #1
(May 29 2014 01:42), Dan Carpenter wrote:
> There was a typo here so we return directly instead of freeing "hwinfo".
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewd-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

> diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
> index 8e856cc..996fdc4 100644
> --- a/sound/firewire/fireworks/fireworks.c
> +++ b/sound/firewire/fireworks/fireworks.c
> @@ -157,7 +157,7 @@ get_hardware_info(struct snd_efw *efw)
>  	/* Hardware metering. */
>  	if (hwinfo->phys_in_grp_count  > HWINFO_MAX_CAPS_GROUPS ||
>  	    hwinfo->phys_out_grp_count > HWINFO_MAX_CAPS_GROUPS) {
> -		return -EIO;
> +		err = -EIO;
>  		goto end;
>  	}
>  	efw->phys_in = hwinfo->phys_in;
Takashi Iwai May 29, 2014, 1:57 p.m. UTC | #2
At Wed, 28 May 2014 19:42:46 +0300,
Dan Carpenter wrote:
> 
> There was a typo here so we return directly instead of freeing "hwinfo".
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks.


Takashi

> 
> diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
> index 8e856cc..996fdc4 100644
> --- a/sound/firewire/fireworks/fireworks.c
> +++ b/sound/firewire/fireworks/fireworks.c
> @@ -157,7 +157,7 @@ get_hardware_info(struct snd_efw *efw)
>  	/* Hardware metering. */
>  	if (hwinfo->phys_in_grp_count  > HWINFO_MAX_CAPS_GROUPS ||
>  	    hwinfo->phys_out_grp_count > HWINFO_MAX_CAPS_GROUPS) {
> -		return -EIO;
> +		err = -EIO;
>  		goto end;
>  	}
>  	efw->phys_in = hwinfo->phys_in;
>

Patch
diff mbox

diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
index 8e856cc..996fdc4 100644
--- a/sound/firewire/fireworks/fireworks.c
+++ b/sound/firewire/fireworks/fireworks.c
@@ -157,7 +157,7 @@  get_hardware_info(struct snd_efw *efw)
 	/* Hardware metering. */
 	if (hwinfo->phys_in_grp_count  > HWINFO_MAX_CAPS_GROUPS ||
 	    hwinfo->phys_out_grp_count > HWINFO_MAX_CAPS_GROUPS) {
-		return -EIO;
+		err = -EIO;
 		goto end;
 	}
 	efw->phys_in = hwinfo->phys_in;