git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
compressed
/
sdhi-sh7372.c
diff --git
a/arch/arm/boot/compressed/sdhi-sh7372.c
b/arch/arm/boot/compressed/sdhi-sh7372.c
index
d403a8b
..
d279294
100644
(file)
--- a/
arch/arm/boot/compressed/sdhi-sh7372.c
+++ b/
arch/arm/boot/compressed/sdhi-sh7372.c
@@
-85,7
+85,7
@@
asmlinkage void mmc_loader(unsigned short *buf, unsigned long len)
goto err;
/* Disable clock to SDHI1 hardware block */
- __raw_writel(__raw_readl(SMSTPCR3)
&
(1 << 13), SMSTPCR3);
+ __raw_writel(__raw_readl(SMSTPCR3)
|
(1 << 13), SMSTPCR3);
mmc_update_progress(MMC_PROGRESS_DONE);