diff --git a/src/shared/gatt-helpers.c b/src/shared/gatt-helpers.c
index c6e179c..3864ed0 100644
--- a/src/shared/gatt-helpers.c
+++ b/src/shared/gatt-helpers.c
data_length = ((uint8_t *) pdu)[0];
list_length = length - 1;
- if ((list_length % data_length) ||
- (data_length != 6 && data_length != 20)) {
+ if ((data_length != 6 && data_length != 20) ||
+ (list_length % data_length)) {
success = false;
goto done;
}
data_length = ((uint8_t *) pdu)[0];
- if (((length - 1) % data_length) ||
- (data_length != 7 && data_length != 21)) {
+ if ((data_length != 7 && data_length != 21) ||
+ ((length - 1) % data_length)) {
success = false;
goto done;
}