diff mbox

mmc: sdhci-iproc: fix oops in sdhci_iproc_writew

Message ID 20150313011101.GA24853@dtor-ws (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Torokhov March 13, 2015, 1:11 a.m. UTC
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>
---
 drivers/mmc/host/sdhci-iproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson March 13, 2015, 10:15 a.m. UTC | #1
On 13 March 2015 at 02:11, Dmitry Torokhov <dtor@chromium.org> wrote:
> 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>

Thanks, applied!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci-iproc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
> index 4139d34..3b423b0 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;
> --
> 2.2.0.rc0.207.ga3a616c
>
>
> --
> Dmitry
diff mbox

Patch

diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
index 4139d34..3b423b0 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;