summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/hbm.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:41:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:41:47 +0200
commitf685fc6ab05192c7bb924288c8685b95e92a7c65 (patch)
tree804b643604f19adefdcbd03065bb3e1bee515cf7 /drivers/misc/mei/hbm.c
parent7adb05bb813d1ba4863c8914eead6139d3d5f8ff (diff)
parent7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff)
downloadtalos-op-linux-f685fc6ab05192c7bb924288c8685b95e92a7c65.tar.gz
talos-op-linux-f685fc6ab05192c7bb924288c8685b95e92a7c65.zip
Merge b4.19-rc4 into char-misc-next
We want the bugfixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hbm.c')
-rw-r--r--drivers/misc/mei/hbm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 09e233d4c0de..e56f3e72d57a 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -1161,15 +1161,18 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr)
props_res = (struct hbm_props_response *)mei_msg;
- if (props_res->status) {
+ if (props_res->status == MEI_HBMS_CLIENT_NOT_FOUND) {
+ dev_dbg(dev->dev, "hbm: properties response: %d CLIENT_NOT_FOUND\n",
+ props_res->me_addr);
+ } else if (props_res->status) {
dev_err(dev->dev, "hbm: properties response: wrong status = %d %s\n",
props_res->status,
mei_hbm_status_str(props_res->status));
return -EPROTO;
+ } else {
+ mei_hbm_me_cl_add(dev, props_res);
}
- mei_hbm_me_cl_add(dev, props_res);
-
/* request property for the next client */
if (mei_hbm_prop_req(dev, props_res->me_addr + 1))
return -EIO;
OpenPOWER on IntegriCloud