1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index d749f08601b8..587dccf95f8e 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/sdhci.c - Secure Digital Host Controller Interface driver
  *
- *  Copyright (C) 2005-2006 Pierre Ossman, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -247,14 +247,13 @@ static void sdhci_read_block_pio(struct sdhci_host *host)
                         chunk_remain = min(blksize, 4);
                 }
 
-                size = min(host->size, host->remain);
-                size = min(size, chunk_remain);
+                size = min(host->remain, chunk_remain);
 
                 chunk_remain -= size;
                 blksize -= size;
                 host->offset += size;
                 host->remain -= size;
-                host->size -= size;
+
                 while (size) {
                         *buffer = data & 0xFF;
                         buffer++;
@@ -289,14 +288,13 @@ static void sdhci_write_block_pio(struct sdhci_host *host)
         buffer = sdhci_sg_to_buffer(host) + host->offset;
 
         while (blksize) {
-                size = min(host->size, host->remain);
-                size = min(size, chunk_remain);
+                size = min(host->remain, chunk_remain);
 
                 chunk_remain -= size;
                 blksize -= size;
                 host->offset += size;
                 host->remain -= size;
-                host->size -= size;
+
                 while (size) {
                         data >>= 8;
                         data |= (u32)*buffer << 24;
@@ -325,7 +323,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
 
         BUG_ON(!host->data);
 
-        if (host->size == 0)
+        if (host->num_sg == 0)
                 return;
 
         if (host->data->flags & MMC_DATA_READ)
@@ -339,10 +337,8 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
                 else
                         sdhci_write_block_pio(host);
 
-                if (host->size == 0)
+                if (host->num_sg == 0)
                         break;
-
-                BUG_ON(host->num_sg == 0);
         }
 
         DBG("PIO transfer complete.\n");
@@ -408,8 +404,6 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
 
                 writel(sg_dma_address(data->sg), host->ioaddr + SDHCI_DMA_ADDRESS);
         } else {
-                host->size = data->blksz * data->blocks;
-
                 host->cur_sg = data->sg;
                 host->num_sg = data->sg_len;
 
@@ -473,10 +467,6 @@ static void sdhci_finish_data(struct sdhci_host *host)
                         "though there were blocks left.\n",
                         mmc_hostname(host->mmc));
                 data->error = MMC_ERR_FAILED;
-        } else if (host->size != 0) {
-                printk(KERN_ERR "%s: %d bytes were left untransferred.\n",
-                        mmc_hostname(host->mmc), host->size);
-                data->error = MMC_ERR_FAILED;
         }
 
         DBG("Ending data transfer (%d bytes)\n", data->bytes_xfered);