diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
| commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
| tree | 7acee111840bd25183513e9bde08e939ffd57be8 /arch/arm/boot/compressed/mmcif-sh7372.c | |
| parent | 7756332f5b64c9c1535712b9679792e8bd4f0019 (diff) | |
| parent | e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 (diff) | |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'arch/arm/boot/compressed/mmcif-sh7372.c')
| -rw-r--r-- | arch/arm/boot/compressed/mmcif-sh7372.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/mmcif-sh7372.c b/arch/arm/boot/compressed/mmcif-sh7372.c index b6f61d9a5a1b..672ae95db5c3 100644 --- a/arch/arm/boot/compressed/mmcif-sh7372.c +++ b/arch/arm/boot/compressed/mmcif-sh7372.c @@ -82,7 +82,7 @@ asmlinkage void mmc_loader(unsigned char *buf, unsigned long len) /* Disable clock to MMC hardware block */ - __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); + __raw_writel(__raw_readl(SMSTPCR3) | (1 << 12), SMSTPCR3); mmc_update_progress(MMC_PROGRESS_DONE); } |