From: "Adamski, Krzysztof (Nokia - PL/Wroclaw)" <krzysztof.adamski@nokia.com>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>
Subject: [PATCH] hwmon: pmbus: protect read-modify-write with lock
Date: Tue, 28 May 2019 09:08:21 +0000 [thread overview]
Message-ID: <20190528090746.GA31184@localhost.localdomain> (raw)
The operation done in the pmbus_update_fan() function is a
read-modify-write operation but it lacks any kind of lock protection
which may cause problems if run more than once simultaneously. This
patch uses an existing update_lock mutex to fix this problem.
Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com>
---
drivers/hwmon/pmbus/pmbus_core.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index ef7ee90ee785..94adbede7912 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -268,6 +268,7 @@ int pmbus_update_fan(struct i2c_client *client, int page, int id,
int rv;
u8 to;
+ mutex_lock(&data->update_lock);
from = pmbus_read_byte_data(client, page,
pmbus_fan_config_registers[id]);
if (from < 0)
@@ -278,11 +279,15 @@ int pmbus_update_fan(struct i2c_client *client, int page, int id,
rv = pmbus_write_byte_data(client, page,
pmbus_fan_config_registers[id], to);
if (rv < 0)
- return rv;
+ goto out;
}
- return _pmbus_write_word_data(client, page,
- pmbus_fan_command_registers[id], command);
+ rv = _pmbus_write_word_data(client, page,
+ pmbus_fan_command_registers[id], command);
+
+out:
+ mutex_lock(&data->update_lock);
+ return rv;
}
EXPORT_SYMBOL_GPL(pmbus_update_fan);
--
2.20.1
next reply other threads:[~2019-05-28 9:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 9:08 Adamski, Krzysztof (Nokia - PL/Wroclaw) [this message]
2019-06-07 22:32 ` [PATCH] hwmon: pmbus: protect read-modify-write with lock Wolfram Sang
2019-06-10 6:36 ` Adamski, Krzysztof (Nokia - PL/Wroclaw)
2019-06-10 7:04 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190528090746.GA31184@localhost.localdomain \
--to=krzysztof.adamski@nokia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).