regmap: Fix work_buf switching for page update during virtual range access.

After page update, orginal work_buf has to be restored regardless of
the result.

Signed-off-by: Krystian Garbaciak <krystian.garbaciak@diasemi.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 83a0166420a40f9cb6ca0083ddec21be901ce64e..d912eb2d19cec9687655759e98003b25865dff28 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -693,10 +693,11 @@ static int _regmap_select_page(struct regmap *map, unsigned int *reg,
                                        range->selector_mask,
                                        win_page << range->selector_shift,
                                        &page_chg);
-                       if (ret < 0)
-                               return ret;
 
                        map->work_buf = orig_work_buf;
+
+                       if (ret < 0)
+                               return ret;
                }
 
                *reg = range->window_start + win_offset;