diff options
author | Dmitry Torokhov <dtor@chromium.org> | 2015-03-12 21:11:01 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-03-23 09:13:47 -0400 |
commit | b1ddaa3d066f28b626a15b15b0dc377fee2e2406 (patch) | |
tree | 378f1fe286c73053108312c65ad827bb8e564b6e | |
parent | 04e079cf6b24c794bbc52b04b370f84cb728540e (diff) |
mmc: sdhci-iproc: fix oops in sdhci_iproc_writew
The driver co-allocates sdhci_iproc_host with sdhci_pltfm_host and so to
access it we need to use sdhci_pltfm_priv() and not pltfm_host->priv.
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/host/sdhci-iproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 4139d34971ad..3b423b0ad8e7 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c | |||
@@ -97,7 +97,7 @@ static inline void sdhci_iproc_writel(struct sdhci_host *host, u32 val, int reg) | |||
97 | static void sdhci_iproc_writew(struct sdhci_host *host, u16 val, int reg) | 97 | static void sdhci_iproc_writew(struct sdhci_host *host, u16 val, int reg) |
98 | { | 98 | { |
99 | struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); | 99 | struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); |
100 | struct sdhci_iproc_host *iproc_host = pltfm_host->priv; | 100 | struct sdhci_iproc_host *iproc_host = sdhci_pltfm_priv(pltfm_host); |
101 | u32 word_shift = REG_OFFSET_IN_BITS(reg); | 101 | u32 word_shift = REG_OFFSET_IN_BITS(reg); |
102 | u32 mask = 0xffff << word_shift; | 102 | u32 mask = 0xffff << word_shift; |
103 | u32 oldval, newval; | 103 | u32 oldval, newval; |