Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / drivers / ata / libata-sff.c

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index cf7acbc..f8380ce 100644 (file)
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2839,7 +2839,7 @@ unsigned int ata_bmdma_port_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
                bmdma_stopped = true;
 
                if (unlikely(host_stat & ATA_DMA_ERR)) {
-                       /* error when transfering data to/from memory */
+                       /* error when transferring data to/from memory */
                        qc->err_mask |= AC_ERR_HOST_BUS;
                        ap->hsm_task_state = HSM_ST_ERR;
                }
@@ -3032,7 +3032,7 @@ void ata_bmdma_start(struct ata_queued_cmd *qc)
         * Or maybe I'm just being paranoid.
         *
         * FIXME: The posting of this write means I/O starts are
-        * unneccessarily delayed for MMIO
+        * unnecessarily delayed for MMIO
         */
 }
 EXPORT_SYMBOL_GPL(ata_bmdma_start);