Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[tomoyo/tomoyo-test1.git] / drivers / infiniband / hw / hfi1 / chip.c

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index baaa440..0814291 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -1461,7 +1461,8 @@ static u64 dc_access_lcb_cntr(const struct cntr_entry *entry, void *context,
                ret = write_lcb_csr(dd, csr, data);
 
        if (ret) {
-               dd_dev_err(dd, "Could not acquire LCB for counter 0x%x", csr);
+               if (!(dd->flags & HFI1_SHUTDOWN))
+                       dd_dev_err(dd, "Could not acquire LCB for counter 0x%x", csr);
                return 0;
        }
 
@@ -6160,7 +6161,7 @@ static int request_host_lcb_access(struct hfi1_devdata *dd)
        ret = do_8051_command(dd, HCMD_MISC,
                              (u64)HCMD_MISC_REQUEST_LCB_ACCESS <<
                              LOAD_DATA_FIELD_ID_SHIFT, NULL);
-       if (ret != HCMD_SUCCESS) {
+       if (ret != HCMD_SUCCESS && !(dd->flags & HFI1_SHUTDOWN)) {
                dd_dev_err(dd, "%s: command failed with error %d\n",
                           __func__, ret);
        }
@@ -6241,7 +6242,8 @@ int acquire_lcb_access(struct hfi1_devdata *dd, int sleep_ok)
        if (dd->lcb_access_count == 0) {
                ret = request_host_lcb_access(dd);
                if (ret) {
-                       dd_dev_err(dd,
+                       if (!(dd->flags & HFI1_SHUTDOWN))
+                               dd_dev_err(dd,
                                   "%s: unable to acquire LCB access, err %d\n",
                                   __func__, ret);
                        goto done;