Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / mmc / host / s3cmci.c

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 1ccd4b2..a04f87d 100644 (file)
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -874,7 +874,7 @@ static void finalize_request(struct s3cmci_host *host)
        if (!mrq->data)
                goto request_done;
 
-       /* Calulate the amout of bytes transfer if there was no error */
+       /* Calculate the amout of bytes transfer if there was no error */
        if (mrq->data->error == 0) {
                mrq->data->bytes_xfered =
                        (mrq->data->blocks * mrq->data->blksz);
@@ -882,7 +882,7 @@ static void finalize_request(struct s3cmci_host *host)
                mrq->data->bytes_xfered = 0;
        }
 
-       /* If we had an error while transfering data we flush the
+       /* If we had an error while transferring data we flush the
         * DMA channel and the fifo to clear out any garbage. */
        if (mrq->data->error != 0) {
                if (s3cmci_host_usedma(host))
@@ -980,7 +980,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
 
        if ((data->blksz & 3) != 0) {
                /* We cannot deal with unaligned blocks with more than
-                * one block being transfered. */
+                * one block being transferred. */
 
                if (data->blocks > 1) {
                        pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz);