Skip to contentSkip to conversation

ALSA: fireworks: small leak on error path

PATCH Applied Dan Carpenter 3 participants 3 messages May 28, 2014 – May 29, 2014

Subsystems (3)
Sound Kernel janitors Firewire audio drivers and IEC 61883-1/6 packet streaming engine
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 2/2 ALSA: fireworks: small leak on error path

There was a typo here so we return directly instead of freeing "hwinfo".

Signed-off-by Dan Carpenter <[email protected]>
sound/firewire/fireworks/fireworks.c +1 -1
index 8e856cc..996fdc4 100644
@@ -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;
maintainer Tested-by on v1 2/2
#1 lore raw
Quoted 3 lines · Dan Carpenter

There was a typo here so we return directly instead of freeing "hwinfo".

Signed-off-by Dan Carpenter <[email protected]>
Reviewd-by Takashi Sakamoto <[email protected]>
Tested-by Takashi Sakamoto <[email protected]>
Quoted 13 lines
sound/firewire/fireworks/fireworks.c +1 -1
index 8e856cc..996fdc4 100644
@@ -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;
Applied
#2 lore raw
In reply to Dan Carpenter

At Wed, 28 May 2014 19:42:46 +0300,

Quoted 4 lines · Dan Carpenter

There was a typo here so we return directly instead of freeing "hwinfo".

Signed-off-by Dan Carpenter <[email protected]>

Applied, thanks.

Takashi

Quoted 15 lines
sound/firewire/fireworks/fireworks.c +1 -1
index 8e856cc..996fdc4 100644
@@ -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;