diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-07-28 15:45:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-07-28 15:45:32 +1000 |
| commit | 459532d7d4d33138c7b0b026705d9494d0b5e96f (patch) | |
| tree | cf613b6d39cc79267a9494fff5ae73fc9632f587 /drivers | |
| parent | 7bc7381849673d3bb4c470f25ffb8e046dce3886 (diff) | |
| parent | 79c87b8f8ba7e5706aa5cb2601635b468820e911 (diff) | |
Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/ipmi/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/ipmi/Kconfig b/drivers/char/ipmi/Kconfig index b061e6b513ed..39565cf74b2c 100644 --- a/drivers/char/ipmi/Kconfig +++ b/drivers/char/ipmi/Kconfig @@ -119,13 +119,13 @@ config ASPEED_KCS_IPMI_BMC provides the access of KCS IO space for BMC side. config NPCM7XX_KCS_IPMI_BMC - depends on ARCH_NPCM7XX || COMPILE_TEST + depends on ARCH_NPCM || COMPILE_TEST select IPMI_KCS_BMC select REGMAP_MMIO - tristate "NPCM7xx KCS IPMI BMC driver" + tristate "NPCM KCS IPMI BMC driver" help Provides a driver for the KCS (Keyboard Controller Style) IPMI - interface found on Nuvoton NPCM7xx SOCs. + interface found on Nuvoton NPCM SOCs. The driver implements the BMC side of the KCS contorller, it provides the access of KCS IO space for BMC side. diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 703433493c85..c8a3b208f923 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -4357,7 +4357,7 @@ static int handle_oem_get_msg_cmd(struct ipmi_smi *intf, /* * The message starts at byte 4 which follows the - * the Channel Byte in the "GET MESSAGE" command + * Channel Byte in the "GET MESSAGE" command */ recv_msg->msg.data_len = msg->rsp_size - 4; memcpy(recv_msg->msg_data, &msg->rsp[4], |