diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:29:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:29:36 -0700 |
| commit | 4970c0cb6aa8996e39b1626887f5fb67a49f5ad1 (patch) | |
| tree | 8e734bdf15768744a0ec03fbc715a6404a4f732b /drivers/misc | |
| parent | 3c0ed7d56d77b61f2177e8b72855ea32073c2091 (diff) | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
Merge 4.3-rc5 into char-misc next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/hbm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c index 8eec887c8f70..6d7c188fb65c 100644 --- a/drivers/misc/mei/hbm.c +++ b/drivers/misc/mei/hbm.c @@ -1209,7 +1209,7 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr) * after the host receives the enum_resp * message clients may be added or removed */ - if (dev->hbm_state <= MEI_HBM_ENUM_CLIENTS && + if (dev->hbm_state <= MEI_HBM_ENUM_CLIENTS || dev->hbm_state >= MEI_HBM_STOPPED) { dev_err(dev->dev, "hbm: add client: state mismatch, [%d, %d]\n", dev->dev_state, dev->hbm_state); |