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

[firefly-linux-kernel-4.4.55.git] / drivers / infiniband / hw / cxgb4 / qp.c

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index c9aaf24bf2b40769c86888c548084a4b75ad8eff..93f6e5bf0ec57ccc53d3ad68a2cde7103eda5931 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -915,7 +915,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
        atomic_inc(&qhp->refcnt);
        spin_unlock_irqrestore(&qhp->lock, *flag);
 
-       /* locking heirarchy: cq lock first, then qp lock. */
+       /* locking hierarchy: cq lock first, then qp lock. */
        spin_lock_irqsave(&rchp->lock, *flag);
        spin_lock(&qhp->lock);
        c4iw_flush_hw_cq(&rchp->cq);
@@ -926,7 +926,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
        if (flushed)
                (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
 
-       /* locking heirarchy: cq lock first, then qp lock. */
+       /* locking hierarchy: cq lock first, then qp lock. */
        spin_lock_irqsave(&schp->lock, *flag);
        spin_lock(&qhp->lock);
        c4iw_flush_hw_cq(&schp->cq);