From b3ae20ea05a9cc652f4a664daed6c847f3bb9ba0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 11 Aug 2010 19:48:41 +0800 Subject: [PATCH] rk2818-sdmmc: fix bad spin_lock_irqsave call --- drivers/mmc/host/rk2818-sdmmc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/rk2818-sdmmc.c b/drivers/mmc/host/rk2818-sdmmc.c index 3bd7ff6c2dab..20f01fe980f1 100644 --- a/drivers/mmc/host/rk2818-sdmmc.c +++ b/drivers/mmc/host/rk2818-sdmmc.c @@ -815,7 +815,7 @@ static void rk2818_sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) break; } - spin_lock_irqsave(host->lock,flags); + spin_lock_irqsave(&host->lock,flags); /* Set the current host bus width */ writel(host->ctype, host->regs + SDMMC_CTYPE); @@ -823,7 +823,7 @@ static void rk2818_sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) writel(readl(host->regs + SDMMC_CTRL) | SDMMC_CTRL_OD_PULLUP, host->regs + SDMMC_CTRL); else writel(readl(host->regs + SDMMC_CTRL) & ~SDMMC_CTRL_OD_PULLUP, host->regs + SDMMC_CTRL); - spin_unlock_irqrestore(host->lock,flags); + spin_unlock_irqrestore(&host->lock,flags); if (ios->clock && (host->current_speed != ios->clock)) { /* @@ -842,7 +842,7 @@ static void rk2818_sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) xjhprintk("SD/MMC busy now(status 0x%x),can not change clock\n",readl(host->regs + SDMMC_STATUS)); //cpu_relax(); } - spin_lock_irqsave(host->lock,flags); + spin_lock_irqsave(&host->lock,flags); /* disable clock */ writel(0, host->regs + SDMMC_CLKENA); writel(0, host->regs + SDMMC_CLKSRC); @@ -862,7 +862,7 @@ static void rk2818_sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->current_speed= ios->clock; - spin_unlock_irqrestore(host->lock,flags); + spin_unlock_irqrestore(&host->lock,flags); } #if 0 @@ -872,7 +872,7 @@ static void rk2818_sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) spin_unlock(&host->lock); } #endif - spin_lock_irqsave(host->lock,flags); + spin_lock_irqsave(&host->lock,flags); switch (ios->power_mode) { case MMC_POWER_UP: @@ -883,7 +883,7 @@ static void rk2818_sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) //rk2818_sdmmc_set_power(host, 0); break; } - spin_unlock_irqrestore(host->lock,flags); + spin_unlock_irqrestore(&host->lock,flags); } -- 2.34.1