mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 09/27] console: Fix console_get_first_active()
Date: Thu, 14 Jun 2018 21:11:18 -0700	[thread overview]
Message-ID: <20180615041136.23492-13-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180615041136.23492-1-andrew.smirnov@gmail.com>

Fix if condition in console_get_first_active() to actually check that
both bit are set.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 common/console_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/console_common.c b/common/console_common.c
index 00e020bd3..0131a1190 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -301,12 +301,13 @@ EXPORT_SYMBOL(console_get_by_name);
 struct console_device *console_get_first_active(void)
 {
 	struct console_device *cdev;
+	const unsigned char active = CONSOLE_STDIN | CONSOLE_STDOUT;
 	/*
 	 * Assumption to have BOTH CONSOLE_STDIN AND STDOUT in the
 	 * same output console
 	 */
 	for_each_console(cdev) {
-		if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT)))
+		if ((cdev->f_active & active) == active)
 			return cdev;
 	}
 
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-06-15  4:12 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-15  4:11 [PATCH 00/27] Console code consolidation Andrey Smirnov
2018-06-15  4:11 ` [PATCH 01/27] pbl: console: Introduce putc_func_t Andrey Smirnov
2018-06-15  4:11 ` [PATCH 02/27] console: Unify console_simple.c and pbl/console.c Andrey Smirnov
2018-06-15  4:49   ` Sam Ravnborg
2018-06-15 12:22     ` Andrey Smirnov
2018-06-15  4:58   ` Sam Ravnborg
2018-06-15  7:26     ` Sascha Hauer
2018-06-15 11:36       ` Andrey Smirnov
2018-06-15 12:18     ` Andrey Smirnov
2018-06-15  4:11 ` [PATCH 03/27] pbl: console: Move '\n' handling into console_putc() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 04/27] console: Reconcile 3 different puts() implementations Andrey Smirnov
2018-06-15  7:37   ` Sascha Hauer
2018-06-15 11:33     ` Andrey Smirnov
2018-06-15  4:11 ` [PATCH 05/27] ratp: Add dependency on CONSOLE_FULL Andrey Smirnov
2018-06-15  4:11 ` [PATCH 06/27] netconsole: " Andrey Smirnov
2018-06-15  4:11 ` [PATCH 07/27] input: " Andrey Smirnov
2018-06-15  4:11 ` [PATCH 08/27] console: Make use of __console_putc() Andrey Smirnov
2018-06-15  4:11 ` Andrey Smirnov [this message]
2018-06-15  4:11 ` [PATCH 10/27] console: Simplify early console code Andrey Smirnov
2018-06-15  4:11 ` [PATCH 11/27] console: Consolidate all implemenatations of ctrlc() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 12/27] console: Drop ARCH_HAS_CTRLC Andrey Smirnov
2018-06-15  4:11 ` [PATCH 13/27] console: Consolidate DEBUG_LL and CONSOLE_* '\n' -> '\n\r' code Andrey Smirnov
2018-06-18 20:18   ` Sascha Hauer
2018-06-18 20:25     ` Andrey Smirnov
2018-06-15  4:11 ` [PATCH 14/27] console: Consolidate DEBUG_LL and CONSOLE_* puts() implementations Andrey Smirnov
2018-06-18 20:22   ` Sascha Hauer
2018-06-18 20:26     ` Andrey Smirnov
2018-06-15  4:11 ` [PATCH 15/27] console_simple: Use console_flush() from CONSOLE_FULL Andrey Smirnov
2018-06-15  4:11 ` [PATCH 16/27] console_simple: Use tstc_raw() as tstc() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 17/27] console_simple: Use getc_raw() as getchar() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 18/27] console_simple: Get rid of global console pointer Andrey Smirnov
2018-06-15  4:11 ` [PATCH 19/27] console_simple: Make use of list_add_tail() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 20/27] console: Share definition for printf with PBL Andrey Smirnov
2018-06-15  4:11 ` [PATCH 21/27] pbl: console: Convert pr_print into a single line #define Andrey Smirnov
2018-06-15  4:11 ` [PATCH 22/27] " Andrey Smirnov
2018-06-15  4:11 ` [PATCH 23/27] console: Remove dputc() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 24/27] console: Simplify dputs() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 25/27] console: Introduce dvprintf() Andrey Smirnov
2018-06-15  4:11 ` [PATCH 26/27] console: Convert printf() into a single line #define Andrey Smirnov
2018-06-15  4:11 ` [PATCH 27/27] psci: console: Convert to use lib/console.c Andrey Smirnov
2018-06-15  9:28 ` [PATCH 00/27] Console code consolidation Sascha Hauer
2018-06-15 12:11   ` Andrey Smirnov
2018-06-18 20:49     ` Sascha Hauer
2018-06-18 23:26       ` Andrey Smirnov
2018-06-19  6:44         ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180615041136.23492-13-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox