diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 10:34:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 10:34:17 -0700 |
commit | 85c1a25494837ff33fdfebe98b2e4cf5b0c78475 (patch) | |
tree | 5d3953f955b8b3dbc17724e097bf711da6e68781 /drivers/char/ipmi/ipmi_msghandler.c | |
parent | fe460a6df6a8427d4ce7c731a0de43b6e10e9f6b (diff) | |
parent | ed6c3a6d8996659e3bbf4214ba26b5e5a7440b26 (diff) | |
download | kernel_replicant_linux-85c1a25494837ff33fdfebe98b2e4cf5b0c78475.tar.gz kernel_replicant_linux-85c1a25494837ff33fdfebe98b2e4cf5b0c78475.tar.bz2 kernel_replicant_linux-85c1a25494837ff33fdfebe98b2e4cf5b0c78475.zip |
Merge tag 'for-linus-5.2' of git://github.com/cminyard/linux-ipmi
Pull IPMI updates from Corey Minyard:
"Some minor cleanups for the IPMI driver"
* tag 'for-linus-5.2' of git://github.com/cminyard/linux-ipmi:
ipmi: Remove warning if no slave address is present
ipmi:ssif: Only unregister the platform driver if it was registered
ipmi:ssif: compare block number correctly for multi-part return messages
ipmi: Add the i2c-addr property for SSIF interfaces
char/ipmi: fix spelling mistake "receieved_messages" -> "received_messages"
ipmi: avoid atomic_inc in exit function
ipmi: Remove file from ipmi_file_private
ipmi_si: remove an unused variable in try_smi_init()
ipmi: Make ipmi_interfaces_srcu variable static
Diffstat (limited to 'drivers/char/ipmi/ipmi_msghandler.c')
-rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 00bf4b17edbf..1dc10740fc0f 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -635,7 +635,7 @@ static DEFINE_MUTEX(ipmidriver_mutex); static LIST_HEAD(ipmi_interfaces); static DEFINE_MUTEX(ipmi_interfaces_mutex); -struct srcu_struct ipmi_interfaces_srcu; +static struct srcu_struct ipmi_interfaces_srcu; /* * List of watchers that want to know when smi's are added and deleted. @@ -5179,7 +5179,7 @@ static void __exit cleanup_ipmi(void) * avoids problems with race conditions removing the timer * here. */ - atomic_inc(&stop_operation); + atomic_set(&stop_operation, 1); del_timer_sync(&ipmi_timer); initialized = false; |