diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 17:03:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 17:03:46 +1100 |
| commit | 4824579dcd8be7c8580237785ce6f7b31db054ea (patch) | |
| tree | 174a084a5068489ab7030227c231fe6f7d0e3124 /drivers/infiniband/hw/qib/qib_iba6120.c | |
| parent | a9be5a59553a6b5d424d8ed37f058edfcc09a7d9 (diff) | |
| parent | 1842d91b7b4c6be23064b6601127293173aa750c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba6120.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_iba6120.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c index 92399d3ffd15..06de1cbcf67d 100644 --- a/drivers/infiniband/hw/qib/qib_iba6120.c +++ b/drivers/infiniband/hw/qib/qib_iba6120.c @@ -707,7 +707,7 @@ static void qib_6120_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_6120_set_intr_state(dd, 0); qib_cancel_sends(dd->pport); |