mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
A few fixes of things in the IPMI area, the watchdog
would have issues at panic time cause by a recently introduced change, a problem with device numbering, one possible panic in the I2C driver (destined for stable). Nothing earth-shattering, but some things that need to go in. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlkHLe4ACgkQIXnXXONXERctaACgtLPKwEc8IGFcdpQ6njZAJXm/ eNgAoIRDUTO3SstAWVtanbUEG8ao74gB =3InS -----END PGP SIGNATURE----- Merge tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi Pull IPMI updates from Corey Minyard: "A few fixes of things in the IPMI area, the watchdog would have issues at panic time cause by a recently introduced change, a problem with device numbering, one possible panic in the I2C driver (destined for stable). Nothing earth-shattering, but some things that need to go in" * tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi: ipmi/watchdog: fix wdog hang on panic waiting for ipmi response ipmi_si: use smi_num for init_name ipmi: bt-bmc: Add ast2500 compatible string ACPI / IPMI: change warning to debug on timeout ACPI / IPMI: allow ACPI_IPMI with IPMI_SSIF ipmi_ssif: use setup_timer ipmi: Fix kernel panic at ipmi_ssif_thread()
This commit is contained in:
commit
6fb41cbd7d
7 changed files with 31 additions and 15 deletions
|
|
@ -256,7 +256,7 @@ config ACPI_PROCESSOR
|
|||
|
||||
config ACPI_IPMI
|
||||
tristate "IPMI"
|
||||
depends on IPMI_SI
|
||||
depends on IPMI_HANDLER
|
||||
default n
|
||||
help
|
||||
This driver enables the ACPI to access the BMC controller. And it
|
||||
|
|
|
|||
|
|
@ -429,8 +429,7 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
|
|||
if (msg->recv_type == IPMI_RESPONSE_RECV_TYPE &&
|
||||
msg->msg.data_len == 1) {
|
||||
if (msg->msg.data[0] == IPMI_TIMEOUT_COMPLETION_CODE) {
|
||||
dev_WARN_ONCE(dev, true,
|
||||
"Unexpected response (timeout).\n");
|
||||
dev_dbg_once(dev, "Unexpected response (timeout).\n");
|
||||
tx_msg->msg_done = ACPI_IPMI_TIMEOUT;
|
||||
}
|
||||
goto out_comp;
|
||||
|
|
|
|||
Loading…
Reference in a new issue