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

Commit a0dbf2a7 authored by Russ Dill's avatar Russ Dill Committed by Tony Lindgren
Browse files

ARM: OMAP2+ smsc911x: Fix possible stale smsc911x flags 



If this function is called the first time with flags set, and the
second time without flags set then the leftover flags from the first
called will be used rather than the desired default flags.

Signed-off-by: default avatarRuss Dill <russ.dill@ti.com>
Tested-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 54da0784

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

+1 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static struct smsc911x_platform_config gpmc_smsc911x_config = { 
	.phy_interface	= PHY_INTERFACE_MODE_MII,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_OPEN_DRAIN,

	.flags		= SMSC911X_USE_16BIT,

};



static struct regulator_consumer_supply gpmc_smsc911x_supply[] = {
@@ -135,8 +134,7 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *gpmc_cfg) 
		gpio_set_value(gpmc_cfg->gpio_reset, 1);

	}



	if (gpmc_cfg->flags)

		gpmc_smsc911x_config.flags = gpmc_cfg->flags;

	gpmc_smsc911x_config.flags = gpmc_cfg->flags ? : SMSC911X_USE_16BIT;



	pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id,

		 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),