diff options
author | Dmitry Torokhov | 2017-05-02 18:48:26 +0200 |
---|---|---|
committer | Dmitry Torokhov | 2017-05-02 18:48:26 +0200 |
commit | 0337966d121ebebf73a1c346123e8112796e684e (patch) | |
tree | c0d4388591e72dc5a26ee976a9cbca70f6bafbbd /drivers/infiniband/hw/qib/qib_iba7220.c | |
parent | Input: i8042 - add Clevo P650RS to the i8042 reset list (diff) | |
parent | Input: ar1021_i2c - use BIT to check for a bit (diff) | |
download | kernel-qcow2-linux-0337966d121ebebf73a1c346123e8112796e684e.tar.gz kernel-qcow2-linux-0337966d121ebebf73a1c346123e8112796e684e.tar.xz kernel-qcow2-linux-0337966d121ebebf73a1c346123e8112796e684e.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.12 merge window.
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba7220.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_iba7220.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c index e55e31a69195..55a18384c22d 100644 --- a/drivers/infiniband/hw/qib/qib_iba7220.c +++ b/drivers/infiniband/hw/qib/qib_iba7220.c @@ -1259,7 +1259,7 @@ static void qib_7220_clear_freeze(struct qib_devdata *dd) /* disable error interrupts, to avoid confusion */ qib_write_kreg(dd, kr_errmask, 0ULL); - /* also disable interrupts; errormask is sometimes overwriten */ + /* also disable interrupts; errormask is sometimes overwritten */ qib_7220_set_intr_state(dd, 0); qib_cancel_sends(dd->pport); |