diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 1f4093f..4e2e4c9 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -883,14 +883,19 @@ static int ldo_regulator_register(struct
snd_soc_codec *codec,
struct regulator_init_data *init_data, int voltage){ +#ifdef CONFIG_SND_SOC_FSL_SGTL5000
- return 0;
+#else dev_err(codec->dev, "this setup needs regulator support in the
kernel\n");
return -EINVAL; +#endif
This looks wrong to me, as this will disable the error for unsolicited platforms in a multi arch kernel!
The CONFIG_SND_SOC_FSL_SGTL5000 micro will be renamed to CONFIG_SND_SOC_FSL_SGTL5000_VF610. In VF610, there has not Power Manager Module, so whether the CONFIG_REGULATOR is enable or Disabled, there will always some errors booting...
static int ldo_regulator_remove(struct snd_soc_codec *codec) { return 0; }
#endif
Why do you add an extra empty line here?
This will be remove later.