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

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

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

arch/arm/mach-omap2/gpmc-smsc911x.c

+7 −4
Original line number Diff line number Diff line
@@ -101,11 +101,14 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data) 


	gpmc_cfg = board_data;



	if (!gpmc_cfg->id) {

		ret = platform_device_register(&gpmc_smsc911x_regulator);

		if (ret < 0) {

		pr_err("Unable to register smsc911x regulators: %d\n", ret);

			pr_err("Unable to register smsc911x regulators: %d\n",

			       ret);

			return;

		}

	}



	if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {

		pr_err("Failed to request GPMC mem region\n");