In unapply_new_state, the old state is re-applied, but p->state is not
set back as it should.
Signed-off-by: NRichard Genoud <richard.genoud@gmail.com>
Reviewed-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>