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

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / hostap / hostap_hw.c

diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index aa15cc4269a18f4ff5a5b24c42c80427567c127e..50f87b60b0bd01400590dcd7e661f7bbe5423cd9 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1466,7 +1466,7 @@ static int prism2_hw_enable(struct net_device *dev, int initial)
         * before it starts acting as an AP, so reset port automatically
         * here just in case */
        if (initial && prism2_reset_port(dev)) {
-               printk("%s: MAC port 0 reseting failed\n", dev->name);
+               printk("%s: MAC port 0 resetting failed\n", dev->name);
                return 1;
        }
 
@@ -1557,7 +1557,7 @@ static void prism2_hw_reset(struct net_device *dev)
        static long last_reset = 0;
 
        /* do not reset card more than once per second to avoid ending up in a
-        * busy loop reseting the card */
+        * busy loop resetting the card */
        if (time_before_eq(jiffies, last_reset + HZ))
                return;
        last_reset = jiffies;