diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 12:11:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 12:11:16 -0500 |
commit | e0d65113a70f1dc514e625cc4e7a7485a4bf72df (patch) | |
tree | 7320a130dc304623f5cf4b5dd8f67fb1776225ca /drivers/mtd/cmdlinepart.c | |
parent | cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2 (diff) | |
parent | 48e546b7f281f251893baa40769581fd15f085fb (diff) |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
mtd: tests: annotate as DANGEROUS in Kconfig
mtd: tests: don't use mtd0 as a default
mtd: clean up usage of MTD_DOCPROBE_ADDRESS
jffs2: add compr=lzo and compr=zlib options
jffs2: implement mount option parsing and compression overriding
mtd: nand: initialize ops.mode
mtd: provide an alias for the redboot module name
mtd: m25p80: don't probe device which has status of 'disabled'
mtd: nand_h1900 never worked
mtd: Add DiskOnChip G3 support
mtd: m25p80: add EON flash EN25Q32B into spi flash id table
mtd: mark block device queue as non-rotational
mtd: r852: make r852_pm_ops static
mtd: m25p80: add support for at25df321a spi data flash
mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
mtd: nand: switch `check_pattern()' to standard `memcmp()'
mtd: nand: invalidate cache on unaligned reads
mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
mtd: nand: wait to set BBT version
mtd: nand: scrub BBT on ECC errors
...
Fix up trivial conflicts:
- arch/arm/mach-at91/board-usb-a9260.c
Merged into board-usb-a926x.c
- drivers/mtd/maps/lantiq-flash.c
add_mtd_partitions -> mtd_device_register vs changed to use
mtd_device_parse_register.
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; |