Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8af6de0 authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C2410: mach-bast.c registering i2c data too early 



The BAST support code is calling s3c_i2c0_set_platdata() from
the map_io() entry, instead of the bast_init() code. This causes
the registration to fail due to kmalloc() not being available
at the time.

This fixes the following error:
s3c_i2c0_set_platdata: no memory for platform data

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 871fcd7c

arch/arm/mach-s3c2410/mach-bast.c

+1 −2
Original line number Diff line number Diff line
@@ -588,8 +588,6 @@ static void __init bast_map_io(void) 


	s3c_device_nand.dev.platform_data = &bast_nand_info;



	s3c_i2c0_set_platdata(&bast_i2c_info);



	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));
@@ -602,6 +600,7 @@ static void __init bast_init(void) 
	sysdev_class_register(&bast_pm_sysclass);

	sysdev_register(&bast_pm_sysdev);



	s3c_i2c0_set_platdata(&bast_i2c_info);

	s3c24xx_fb_set_platdata(&bast_fb_info);

	platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));