Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / cw1200 / wsm.c

diff --git a/drivers/net/wireless/cw1200/wsm.c b/drivers/net/wireless/cw1200/wsm.c
index cbb74d7a9be537d5a88671e0ecd2602e11abbaa6..9e0ca3048657533df52055ac8c30e01006e95048 100644 (file)
--- a/drivers/net/wireless/cw1200/wsm.c
+++ b/drivers/net/wireless/cw1200/wsm.c
@@ -1199,7 +1199,7 @@ bool wsm_flush_tx(struct cw1200_common *priv)
 
        if (priv->bh_error) {
                /* In case of failure do not wait for magic. */
-               pr_err("[WSM] Fatal error occured, will not flush TX.\n");
+               pr_err("[WSM] Fatal error occurred, will not flush TX.\n");
                return false;
        } else {
                /* Get a timestamp of "oldest" frame */