Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index fcf9068..1ea80d8 100644 (file)
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -155,7 +155,7 @@ static struct resource __devinitdata tc6393xb_nand_resources[] = {
        },
 };
 
-static struct resource __devinitdata tc6393xb_mmc_resources[] = {
+static struct resource tc6393xb_mmc_resources[] = {
        {
                .start  = 0x800,
                .end    = 0x9ff,
@@ -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);