diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-07-07 15:03:24 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-08-24 14:32:01 +0200 |
| commit | 8020700c7d245d6bd11d62d5b8d63add8deb7059 (patch) | |
| tree | a50f172c62970dd082d2b7e77c14696fde0f7452 /sound | |
| parent | ecd7e04c7d77dd9ace1fffba7c3d40400d1f3a7f (diff) | |
regulator: allow GPIO 0 to be used for an enable signal
GPIO number 0 *is* legal and must be accepted.
Set .ena_gpio to -ENODEV on regulators having no GPIO in preparation
of a code change to accept GPIO 0 in the config.
(cherry picked from commit c87ddbb1325a448d56a920513206592f03bca117)
Conflicts:
arch/arm/mach-imx/gpc.c
drivers/regulator/88pm8607.c
drivers/regulator/ab8500-ext.c
drivers/regulator/ab8500.c
drivers/regulator/ad5398.c
drivers/regulator/arizona-micsupp.c
drivers/regulator/isl6271a-regulator.c
drivers/regulator/lp3972.c
drivers/regulator/max1586.c
drivers/regulator/max8660.c
drivers/regulator/max8925-regulator.c
drivers/regulator/max8952.c
drivers/regulator/max8998.c
drivers/regulator/mc13783-regulator.c
drivers/regulator/s2mps11.c
drivers/regulator/tps65217-regulator.c
drivers/regulator/tps6524x-regulator.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 23552b7108e5..b677858a7554 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -822,7 +822,7 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, { struct ldo_regulator *ldo; struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); - struct regulator_config config = { }; + struct regulator_config config = { .ena_gpio = -ENODEV }; ldo = kzalloc(sizeof(struct ldo_regulator), GFP_KERNEL); |