xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4.9-rc3 into char-misc-next

Browse Source 
We need the binder patches in here to build on for other submitted
patches to apply properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2016-10-30 06:25:44 -04:00
parent e334cd69fa a909d3e636
commit d4608a83f7
288 changed files with 2601 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/misc/mei/hw-txe.c
View File

@@ -981,11 +981,13 @@ static bool mei_txe_check_and_ack_intrs(struct mei_device *dev, bool do_ack)
hisr = mei_txe_br_reg_read(hw, HISR_REG);
aliveness = mei_txe_aliveness_get(dev);
if (hhisr & IPC_HHIER_SEC && aliveness)
if (hhisr & IPC_HHIER_SEC && aliveness) {
ipc_isr = mei_txe_sec_reg_read_silent(hw,
SEC_IPC_HOST_INT_STATUS_REG);
else
} else {
ipc_isr = 0;
hhisr &= ~IPC_HHIER_SEC;
}
generated = generated ||
(hisr & HISR_INT_STS_MSK) ||