summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-20 09:34:37 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-20 09:34:47 +0000
commit489e7bece7f6859a7df484a4dce08fa51fb0d876 (patch)
treed930d7c3a69490a24916236feac68ad863c06702 /arch/arm/mach-omap2
parentf82989bde1cfa5e2b4614d8e4896d795dae418d9 (diff)
parent5353ec2cd13deb4f70aef1dcd296cadaac3f780b (diff)
Merge branch 'fixes' into next/fixes-non-critical
The one fix didn't make the cut for 3.3, so we're putting it into v3.4. Tony tells me "There are more patches needed to make multiple smsc91x instances work, but we need to hear from people with such boards first. Then those can be tagged for stable.", so we don't mark this patch stable yet. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/gpmc-smsc911x.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index bbb870c04a5..5e5880d6d09 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -101,10 +101,13 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
gpmc_cfg = board_data;
- ret = platform_device_register(&gpmc_smsc911x_regulator);
- if (ret < 0) {
- pr_err("Unable to register smsc911x regulators: %d\n", ret);
- return;
+ if (!gpmc_cfg->id) {
+ ret = platform_device_register(&gpmc_smsc911x_regulator);
+ if (ret < 0) {
+ pr_err("Unable to register smsc911x regulators: %d\n",
+ ret);
+ return;
+ }
}
if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {