Skip to content
Snippets Groups Projects
Commit 9704868c authored by Jurica Vukadin's avatar Jurica Vukadin Committed by Greg Kroah-Hartman
Browse files

kconfig: Update config changed flag before calling callback


[ Upstream commit ee06a3ef ]

Prior to commit 5ee54659 ("kconfig: change sym_change_count to a
boolean flag"), the conf_updated flag was set to the new value *before*
calling the callback. xconfig's save action depends on this behaviour,
because xconfig calls conf_get_changed() directly from the callback and
now sees the old value, thus never enabling the save button or the
shortcut.

Restore the previous behaviour.

Fixes: 5ee54659 ("kconfig: change sym_change_count to a boolean flag")
Signed-off-by: default avatarJurica Vukadin <jura@vukad.in>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 21175141
No related branches found
No related tags found
Loading
...@@ -1226,10 +1226,12 @@ static void (*conf_changed_callback)(void); ...@@ -1226,10 +1226,12 @@ static void (*conf_changed_callback)(void);
void conf_set_changed(bool val) void conf_set_changed(bool val)
{ {
if (conf_changed_callback && conf_changed != val) bool changed = conf_changed != val;
conf_changed_callback();
conf_changed = val; conf_changed = val;
if (conf_changed_callback && changed)
conf_changed_callback();
} }
bool conf_get_changed(void) bool conf_get_changed(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment