Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / drivers / mfd / tc6393xb.c

diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index fcf9068..ef6c42c 100644 (file)
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -732,9 +732,9 @@ err_gpio_add:
        if (tc6393xb->gpio.base != -1)
                temp = gpiochip_remove(&tc6393xb->gpio);
        tcpd->disable(dev);
-err_clk_enable:
-       clk_disable(tc6393xb->clk);
 err_enable:
+       clk_disable(tc6393xb->clk);
+err_clk_enable:
        iounmap(tc6393xb->scr);
 err_ioremap:
        release_resource(&tc6393xb->rscr);