Btrfs: make sure reserve_metadata_bytes doesn't leak out strange errors

[pandora-kernel.git] / arch / arm / mach-mx3 / mach-mx31_3ds.c

diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 544d3e4..034be62 100644 (file)
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -488,10 +488,12 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {
 };
 
 /* MC13783 */
-static struct mc13xxx_platform_data mc13783_pdata __initdata = {
-       .regulators = mx31_3ds_regulators,
-       .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
-       .flags  = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN
+static struct mc13xxx_platform_data mc13783_pdata = {
+       .regulators = {
+               .regulators = mx31_3ds_regulators,
+               .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
+       },
+       .flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,
 };
 
 /* SPI */