2006-09-26 17:54:37

by Jeff Dike

Subject: [PATCH 5/5] UML - fix allocation size

Fix an instance of ptr=alloc(sizeof(ptr)). Grepping showed no more instances
of this pattern.

Also fixed the formatting in the area.

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.18-mm/arch/um/drivers/net_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/net_kern.c 2006-09-12 16:31:36.000000000 -0400
+++ linux-2.6.18-mm/arch/um/drivers/net_kern.c 2006-09-22 10:17:11.000000000 -0400
@@ -560,12 +560,13 @@ static int eth_setup(char *str)
int n, err;

err = eth_parse(str, &n, &str);
- if(err) return(1);
+ if(err)
+ return 1;

- new = alloc_bootmem(sizeof(new));
+ new = alloc_bootmem(sizeof(*new));
if (new == NULL){
printk("eth_init : alloc_bootmem failed\n");
- return(1);
+ return 1;
}

INIT_LIST_HEAD(&new->list);
@@ -573,7 +574,7 @@ static int eth_setup(char *str)
new->init = str;

list_add_tail(&new->list, &eth_cmd_line);
- return(1);
+ return 1;
}

__setup("eth", eth_setup);