Skip to contentSkip to conversation

cs8900_initialize() cleanup [rev2]

PATCH New Matthias Kaehlcke 2 participants 2 messages Jan 21, 2010 Network drivers

lore
Share & tools
lore

Matthias Kaehlcke

author
#0 lore raw

PATCH 1/1 cs8900_initialize() cleanup [rev2]

cs8900_initialize(): remove unecessary calls to free() and fix memory leak

Signed-off-by Matthias Kaehlcke <[email protected]>
---
 drivers/net/cs8900.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/cs8900.c +1 -2
index df36004..9424fb2 100644
@@ -308,14 +308,13 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 
 	dev = malloc(sizeof(*dev));
 	if (!dev) {
-		free(dev);
 		return 0;
 	}
 	memset(dev, 0, sizeof(*dev));
 
 	priv = malloc(sizeof(*priv));
 	if (!priv) {
-		free(priv);
+		free(dev);
 		return 0;
 	}
 	memset(priv, 0, sizeof(*priv));
Signature · 1 line
1.6.3.1
Applied
#1 lore raw

PATCH 1/1 cs8900_initialize() cleanup [rev2]

Matthias,

Quoted 18 lines · Matthias Kaehlcke

cs8900_initialize(): remove unecessary calls to free() and fix memory leak

Signed-off-by Matthias Kaehlcke <[email protected]>
---
 drivers/net/cs8900.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/cs8900.c +0 -1
index df36004..9424fb2 100644
@@ -308,14 +308,13 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 
 	dev = malloc(sizeof(*dev));
 	if (!dev) {
-		free(dev);
 		return 0;

drivers/net/cs8900.c int cs8900_initialize(u8 dev_num, int base_addr) · line 320

Quoted 10 lines
drivers/net/cs8900.c +1 -1
 	}
 	memset(dev, 0, sizeof(*dev));
 
 	priv = malloc(sizeof(*priv));
 	if (!priv) {
-		free(priv);
+		free(dev);
 		return 0;
 	}
 	memset(priv, 0, sizeof(*priv));

Applied to net repo.

thanks,
Ben