pinctrl: at91: fix clk_unprepare and clk_disable order

clk_unprepare shall be called before clk_disable.
Fix the issue by replacing the clk_unprepare and clk_disable calls by a
single clk_disable_unprepare call.

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index bcfc8a2eebca..f91c72f878ad 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1365,13 +1365,11 @@ void at91_pinctrl_gpio_suspend(void)
                 __raw_writel(backups[i], pio + PIO_IDR);
                 __raw_writel(wakeups[i], pio + PIO_IER);
 
-                if (!wakeups[i]) {
-                        clk_unprepare(gpio_chips[i]->clock);
-                        clk_disable(gpio_chips[i]->clock);
-                } else {
+                if (!wakeups[i])
+                        clk_disable_unprepare(gpio_chips[i]->clock);
+                else
                         printk(KERN_DEBUG "GPIO-%c may wake for %08x\n",
                                'A'+i, wakeups[i]);
-                }
         }
 }