summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@chromium.org>2015-03-13 02:11:01 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2015-03-23 14:13:47 +0100
commitb1ddaa3d066f28b626a15b15b0dc377fee2e2406 (patch)
tree378f1fe286c73053108312c65ad827bb8e564b6e /drivers/mmc
parentmmc: sdhci: fix card presence logic in sdhci_request function (diff)
downloadlinux-b1ddaa3d066f28b626a15b15b0dc377fee2e2406.tar.xz
linux-b1ddaa3d066f28b626a15b15b0dc377fee2e2406.zip
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-iproc.c2
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)
static void sdhci_iproc_writew(struct sdhci_host *host, u16 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_iproc_host *iproc_host = pltfm_host->priv;
+ struct sdhci_iproc_host *iproc_host = sdhci_pltfm_priv(pltfm_host);
u32 word_shift = REG_OFFSET_IN_BITS(reg);
u32 mask = 0xffff << word_shift;
u32 oldval, newval;