Commit 489e7bec authored by Arnd Bergmann's avatar Arnd Bergmann

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: default avatarArnd Bergmann <arnd@arndb.de>
parents f82989bd 5353ec2c
...@@ -101,10 +101,13 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data) ...@@ -101,10 +101,13 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
gpmc_cfg = board_data; gpmc_cfg = board_data;
ret = platform_device_register(&gpmc_smsc911x_regulator); if (!gpmc_cfg->id) {
if (ret < 0) { ret = platform_device_register(&gpmc_smsc911x_regulator);
pr_err("Unable to register smsc911x regulators: %d\n", ret); if (ret < 0) {
return; pr_err("Unable to register smsc911x regulators: %d\n",
ret);
return;
}
} }
if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) { if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment