carl9170: Update to latest upstream

[linux-libre-firmware.git] / carl9170fw / config / expr.c

diff --git a/carl9170fw/config/expr.c b/carl9170fw/config/expr.c
index 77ffff3a053ccb844a0f368ae59661a01bc8444c..9f1de58e9f0c995fba0a0a0cf076be4a18e79ca1 100644 (file)
--- a/carl9170fw/config/expr.c
+++ b/carl9170fw/config/expr.c
@@ -254,6 +254,13 @@ static int expr_eq(struct expr *e1, struct expr *e2)
 {
        int res, old_count;
 
+       /*
+        * A NULL expr is taken to be yes, but there's also a different way to
+        * represent yes. expr_is_yes() checks for either representation.
+        */
+       if (!e1 || !e2)
+               return expr_is_yes(e1) && expr_is_yes(e2);
+
        if (e1->type != e2->type)
                return 0;
        switch (e1->type) {