summaryrefslogtreecommitdiff
path: root/scripts/kconfig/expr.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2020-01-27 17:48:30 +0100
committerMiquel Raynal <miquel.raynal@bootlin.com>2020-01-27 17:48:30 +0100
commit701ddf0bbfc761b8bdc974ce9c4e05f9833683e3 (patch)
tree1009975aacf14d36cc280dfeef1a9a816fa16ef8 /scripts/kconfig/expr.c
parent0dcf2572710d68c305e58946c435ddf67ea16bf3 (diff)
parentccfb9299a0b63da4fde607c822e1470472a46177 (diff)
Merge tag 'spi-nor/for-5.6' into mtd/next
SPI NOR core changes: - Add support for TB selection using SR bit 6, - Add support for few flashes.
Diffstat (limited to 'scripts/kconfig/expr.c')
-rw-r--r--scripts/kconfig/expr.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 77ffff3a053c..9f1de58e9f0c 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/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) {