WAIT_FOR_SYSFS ignores further conditions

[Andrey Borzenkov <arvidjaar@mail.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 84 bytes --]

Is it intentional? It looks rather like copy'n'paste slip. Patch attached.

-andrey

[-- Attachment #1.2: wait_for_sysfs_ignores_other_conditions.diff --]
[-- Type: text/x-diff, Size: 1181 bytes --]

Subject: [PATCH] WAIT_FOR_SYSFS was ignoring other conditions, notably SYSFS

From: Andrey Borzenkov <arvidjaar@mail.ru>



Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>
---

 udev_rules.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index f1bbfd8..dac6b43 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -736,16 +736,14 @@ static int match_rule(struct udevice *ud
 		int match;
 
 		match = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
-		if (match && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
+		if (match && (rule->wait_for_sysfs.operation == KEY_OP_MATCH))
 			dbg("WAIT_FOR_SYSFS is true (matching value)");
-			return 0;
-		}
-		if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH)) {
+		else if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH))
 			dbg("WAIT_FOR_SYSFS is true, (non matching value)");
-			return 0;
+		else {
+			dbg("WAIT_FOR_SYSFS is false");
+			goto nomatch;
 		}
-		dbg("WAIT_FOR_SYSFS is false");
-		return -1;
 	}
 
 	/* walk up the chain of parent devices and find a match */

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]