diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2021-08-03 21:06:11 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-15 09:47:34 +0200 |
| commit | c2451d5439d08ff351a6d07d51ec35d354a3d2df (patch) | |
| tree | d88e4ffcbd142a82ea31f692c31811da104d45d5 /drivers/counter | |
| parent | a1194b805c900a0f5fdc077614bec5c471cddb3b (diff) | |
| download | linux-c2451d5439d08ff351a6d07d51ec35d354a3d2df.tar.gz linux-c2451d5439d08ff351a6d07d51ec35d354a3d2df.tar.bz2 linux-c2451d5439d08ff351a6d07d51ec35d354a3d2df.zip | |
counter: 104-quad-8: Return error when invalid mode during ceiling_write
[ Upstream commit 728246e8f7269ecd35a2c6e6795323e6d8f48db7 ]
The 104-QUAD-8 only has two count modes where a ceiling value makes
sense: Range Limit and Modulo-N. Outside of these two modes, setting a
ceiling value is an invalid operation -- so let's report it as such by
returning -EINVAL.
Fixes: fc069262261c ("counter: 104-quad-8: Add lock guards - generic interface")
Acked-by: Syed Nayyar Waris <syednwaris@gmail.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Link: https://lore.kernel.org/r/a2147f022829b66839a1db5530a7fada47856847.1627990337.git.vilhelm.gray@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/counter')
| -rw-r--r-- | drivers/counter/104-quad-8.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index 5c23a9a56921..f261a57af1c0 100644 --- a/drivers/counter/104-quad-8.c +++ b/drivers/counter/104-quad-8.c @@ -1230,12 +1230,13 @@ static ssize_t quad8_count_ceiling_write(struct counter_device *counter, case 1: case 3: quad8_preset_register_set(priv, count->id, ceiling); - break; + mutex_unlock(&priv->lock); + return len; } mutex_unlock(&priv->lock); - return len; + return -EINVAL; } static ssize_t quad8_count_preset_enable_read(struct counter_device *counter, |