projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4c5d499
)
Merge tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 29 Dec 2014 21:19:56 +0000
(13:19 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 29 Dec 2014 21:19:56 +0000
(13:19 -0800)
Pull one MMC fix from Ulf Hansson:
"MMC core:
- Fix selection of buswidth for mmc hosts supporting 1-bit only"
* tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc:
mmc: core: stop trying to switch width when only one bit is supported
drivers/mmc/core/mmc.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/core/mmc.c
b/drivers/mmc/core/mmc.c
index 02ad79229f65ecf0b50b9bf29a1f63c0d297910e..7466ce098e60a086e4f60c5111c19c1b85cd6d60 100644
(file)
--- a/
drivers/mmc/core/mmc.c
+++ b/
drivers/mmc/core/mmc.c
@@
-886,7
+886,7
@@
static int mmc_select_bus_width(struct mmc_card *card)
unsigned idx, bus_width = 0;
int err = 0;
- if (!mmc_can_ext_csd(card)
&&
+ if (!mmc_can_ext_csd(card)
||
!(host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)))
return 0;