diff options
Diffstat (limited to 'drivers/mtd/cmdlinepart.c')
-rw-r--r-- | drivers/mtd/cmdlinepart.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c index 8cf667da240..ddf9ec6d916 100644 --- a/drivers/mtd/cmdlinepart.c +++ b/drivers/mtd/cmdlinepart.c | |||
@@ -189,10 +189,7 @@ static struct mtd_partition * newpart(char *s, | |||
189 | extra_mem_size; | 189 | extra_mem_size; |
190 | parts = kzalloc(alloc_size, GFP_KERNEL); | 190 | parts = kzalloc(alloc_size, GFP_KERNEL); |
191 | if (!parts) | 191 | if (!parts) |
192 | { | ||
193 | printk(KERN_ERR ERRP "out of memory\n"); | ||
194 | return NULL; | 192 | return NULL; |
195 | } | ||
196 | extra_mem = (unsigned char *)(parts + *num_parts); | 193 | extra_mem = (unsigned char *)(parts + *num_parts); |
197 | } | 194 | } |
198 | /* enter this partition (offset will be calculated later if it is zero at this point) */ | 195 | /* enter this partition (offset will be calculated later if it is zero at this point) */ |
@@ -317,8 +314,8 @@ static int mtdpart_setup_real(char *s) | |||
317 | * the first one in the chain if a NULL mtd_id is passed in. | 314 | * the first one in the chain if a NULL mtd_id is passed in. |
318 | */ | 315 | */ |
319 | static int parse_cmdline_partitions(struct mtd_info *master, | 316 | static int parse_cmdline_partitions(struct mtd_info *master, |
320 | struct mtd_partition **pparts, | 317 | struct mtd_partition **pparts, |
321 | unsigned long origin) | 318 | struct mtd_part_parser_data *data) |
322 | { | 319 | { |
323 | unsigned long offset; | 320 | unsigned long offset; |
324 | int i; | 321 | int i; |