diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:53:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:53:24 -0800 |
| commit | 9ddabb6700f82a033a76bcf7a547204fa12aaa17 (patch) | |
| tree | f35c7be566b9c1c02cce775562d70bb42e5e8e51 /arch/arm/plat-s3c/dev-nand.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | ARM: MINI2440: Fixup __initdata usage (diff) | |
| download | linux-dev-9ddabb6700f82a033a76bcf7a547204fa12aaa17.tar.xz linux-dev-9ddabb6700f82a033a76bcf7a547204fa12aaa17.zip | |
Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
ARM: MINI2440: Fixup __initdata usage
ARM: MINI2440: Fix crash on boot due to improper __initdata qualifier
ARM: SMDK6410: Specify no GPIO for B_PWR_5V regulator
ARM: S3C: NAND: Check the existence of nr_map before copying
Diffstat (limited to 'arch/arm/plat-s3c/dev-nand.c')
| -rw-r--r-- | arch/arm/plat-s3c/dev-nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/dev-nand.c b/arch/arm/plat-s3c/dev-nand.c index 84808ccda70e..a52fb6cf618f 100644 --- a/arch/arm/plat-s3c/dev-nand.c +++ b/arch/arm/plat-s3c/dev-nand.c @@ -58,8 +58,8 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set) return -ENOMEM; } - size = sizeof(int) * set->nr_chips; - if (size) { + if (set->nr_map && set->nr_chips) { + size = sizeof(int) * set->nr_chips; ptr = kmemdup(set->nr_map, size, GFP_KERNEL); set->nr_map = ptr; |