diff mbox

[U-Boot,7/8] net: emaclite: Free allocated space for device

Message ID 1314362843-18214-7-git-send-email-monstr@monstr.eu
State Superseded
Delegated to: Michal Simek
Headers show

Commit Message

Michal Simek Aug. 26, 2011, 12:47 p.m. UTC 
Free allocated space for device when allocating
failed for private data.

Signed-off-by: Michal Simek <monstr@monstr.eu>
---
 drivers/net/xilinx_emaclite.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Mike Frysinger Aug. 26, 2011, 7:25 p.m. UTC | #1 
On Friday, August 26, 2011 08:47:22 Michal Simek wrote:
> --- a/drivers/net/xilinx_emaclite.c
> +++ b/drivers/net/xilinx_emaclite.c
> @@ -356,8 +356,10 @@ int xilinx_emaclite_initialize (bd_t *bis, int
> base_addr) return -1;
> 
>  	emaclite = calloc(1, sizeof(struct xemaclite));
> -	if (emaclite == NULL)
> +	if (emaclite == NULL) {
> +		free(dev);
>  		return -1;
> +	}

since this bug was introduced by your patch 5/8, please squash it into that 
rather than sending out a known buggy one
-mike
Michal Simek Aug. 29, 2011, 5:50 a.m. UTC | #2 
Mike Frysinger wrote:
> On Friday, August 26, 2011 08:47:22 Michal Simek wrote:
>> --- a/drivers/net/xilinx_emaclite.c
>> +++ b/drivers/net/xilinx_emaclite.c
>> @@ -356,8 +356,10 @@ int xilinx_emaclite_initialize (bd_t *bis, int
>> base_addr) return -1;
>>
>>  	emaclite = calloc(1, sizeof(struct xemaclite));
>> -	if (emaclite == NULL)
>> +	if (emaclite == NULL) {
>> +		free(dev);
>>  		return -1;
>> +	}
> 
> since this bug was introduced by your patch 5/8, please squash it into that 
> rather than sending out a known buggy one

aah. Good point.

Thanks,
Michal
diff mbox

Patch

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index ac6c783..e0b6ce5 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -356,8 +356,10 @@  int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
 		return -1;
 
 	emaclite = calloc(1, sizeof(struct xemaclite));
-	if (emaclite == NULL)
+	if (emaclite == NULL) {
+		free(dev);
 		return -1;
+	}
 
 	dev->priv = emaclite;