Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / staging / rt2860 / common / cmm_mac_pci.c

diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c
index 850f0fb..d06f0a6 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_mac_pci.c
+++ b/drivers/staging/rt2860/common/cmm_mac_pci.c
@@ -753,7 +753,7 @@ BOOLEAN AsicCheckCommanOk(struct rt_rtmp_adapter *pAd, u8 Command)
 
        /* This command's status is at the same position as command. So AND command position's bitmask to read status. */
        if (i < 200) {
-               /* If Status is 1, the comamnd is success. */
+               /* If Status is 1, the command is success. */
                if (((CmdStatus & ThisCIDMask) == 0x1)
                    || ((CmdStatus & ThisCIDMask) == 0x100)
                    || ((CmdStatus & ThisCIDMask) == 0x10000)
@@ -1446,7 +1446,7 @@ BOOLEAN RT28xxPciAsicRadioOff(struct rt_rtmp_adapter *pAd,
           pAd->CheckDmaBusyCount = 0;
           }
         */
-/*KH Debug:My original codes have the follwoing codes, but currecnt codes do not have it. */
+/*KH Debug:My original codes have the following codes, but currecnt codes do not have it. */
 /* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */
        RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280);
 /*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */