Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into mmc-next

ARM: tegra: DT-related fixes needed by the MMC tree

In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 60063ccb4c4b..98342213ed21 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1453,7 +1453,7 @@ static void dw_mci_read_data_pio(struct dw_mci *host)
                 if (!sg_miter_next(sg_miter))
                         goto done;
 
-                host->sg = sg_miter->__sg;
+                host->sg = sg_miter->piter.sg;
                 buf = sg_miter->addr;
                 remain = sg_miter->length;
                 offset = 0;
@@ -1508,7 +1508,7 @@ static void dw_mci_write_data_pio(struct dw_mci *host)
                 if (!sg_miter_next(sg_miter))
                         goto done;
 
-                host->sg = sg_miter->__sg;
+                host->sg = sg_miter->piter.sg;
                 buf = sg_miter->addr;
                 remain = sg_miter->length;
                 offset = 0;