Skip to contentSkip to conversation

counter: 104-quad-8: Return error when invalid mode during ceiling_write

PATCH In review William Breathitt Gray 2 participants 2 messages Jun 10, 2021 – Jun 20, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 counter: 104-quad-8: Return error when invalid mode during ceiling_write

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")
Cc Syed Nayyar Waris <[email protected]>
---
 drivers/counter/104-quad-8.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/counter/104-quad-8.c +3 -2
index 09a9a77cce06..81f9642777fb 100644
@@ -715,12 +715,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,
Signature · 1 line
2.32.0
Acked-by on v1 1/1
#1 lore raw
Quoted 34 lines · William Breathitt Gray

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")
Cc Syed Nayyar Waris <[email protected]>
---
 drivers/counter/104-quad-8.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/counter/104-quad-8.c +3 -3
index 09a9a77cce06..81f9642777fb 100644
@@ -715,12 +715,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,
--
Quoted 2 lines

2.32.0

Thanks