From patchwork Fri Jul 21 19:13:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 792292 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M7k+2VmI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xDgSP2jSGz9s3w for ; Sat, 22 Jul 2017 05:14:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CCEFEC21D8E; Fri, 21 Jul 2017 19:14:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7E86AC21D97; Fri, 21 Jul 2017 19:13:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F2253C21D86; Fri, 21 Jul 2017 19:13:31 +0000 (UTC) Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by lists.denx.de (Postfix) with ESMTPS id DD87AC21D7D for ; Fri, 21 Jul 2017 19:13:30 +0000 (UTC) Received: by mail-qk0-f194.google.com with SMTP id d136so4940844qkg.3 for ; Fri, 21 Jul 2017 12:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZIhZBoN0WKfllh/a7JewG3SGxa64lvY3WPHuxs/Jnms=; b=M7k+2VmIQgv4sW2iJkdgDn4WEJSKVEZEqyf4re1ig3QXetW5zhAxRt2gUQSjOgtjum ctqEF5/8Zk0ND364uGk/eirbTKyXXv4cO3JfdYWmCdptIZATs6hEwxXvLjvN1lUQKa/H UUQHtNP2t46H5tVxs9ytszCEh04nKJSI2PFEF0o9Z8UA32whaJwZIqWK7mnPkbGFWkkL jkNts0kcbKOpnqzVyvXbGGaj7LnC8kDiQ9ODrvTEeB02/oWbCgp9TiB33/Q0ko/pFuxL m3Sk9tUG9AzxOSJDqkpCHBYz9ScWHKUWbsKr8Ati6EUdcKVtViCKkiNuITILgohAv3+h RjuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZIhZBoN0WKfllh/a7JewG3SGxa64lvY3WPHuxs/Jnms=; b=GvZi/XpF+D+kNlN1hL+fNSUDSVuHi8yDRIJwLTJqq2uxqOgCt4swzRhHUc44sqYcBy zL7WQkua+1n4ROPv9o2yf8ulszW5I6vNZigZwL/fZcaapsrZmUmtUBh2jlqri4AyhONI 223fLkxY+LpoE2RVRiZWw5nCF4E0JLd20L6O9OadwQhR+JIstmo9W67Y2RBTZtD3nQKR kM0DetwpnA+mAPKgTa5tA+N4hLXTQ+ll3ctqr2PxvskmKlbKvqYOz9CTHSvxbPB9c4GT hN8WKwiTr4QFZ39K6QTgvTruNEF+aOD+0kL8EKM1mR9NWE5X6Dv0t0AME2O681MgBQRF pkvw== X-Gm-Message-State: AIVw110Ri4kwtrkIV6qJ3nbMrtTeEgJoPYL1nkSvxj3GkQAkUR43av/i AtRebxrC2d/v8rpX5q4= X-Received: by 10.55.79.77 with SMTP id d74mr11156185qkb.183.1500664409600; Fri, 21 Jul 2017 12:13:29 -0700 (PDT) Received: from localhost ([144.121.20.162]) by smtp.gmail.com with ESMTPSA id 35sm4051876qtr.57.2017.07.21.12.13.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Jul 2017 12:13:28 -0700 (PDT) From: Rob Clark To: U-Boot Mailing List Date: Fri, 21 Jul 2017 15:13:23 -0400 Message-Id: <20170721191324.8696-1-robdclark@gmail.com> X-Mailer: git-send-email 2.13.0 Subject: [U-Boot] [PATCH 1/2] usb: kbd: don't fail with iomux X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" stdin might not be set, which would cause iomux_doenv() to fail therefore causing probe_usb_keyboard() to fail. Furthermore if we do have iomux enabled, the sensible thing (in terms of user experience) would be to simply add ourselves to the list of stdin devices. Signed-off-by: Rob Clark --- common/usb_kbd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index d2d29cc98f..72cf78abd4 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -517,7 +517,21 @@ static int probe_usb_keyboard(struct usb_device *dev) stdinname = getenv("stdin"); #if CONFIG_IS_ENABLED(CONSOLE_MUX) + char *devname = DEVNAME; + /* stdin might not be set yet.. either way, with console-mux the + * sensible thing to do is add ourselves to the list of stdio + * devices: + */ + if (stdinname) { + char *newstdin = malloc(strlen(stdinname) + strlen(","DEVNAME) + 1); + sprintf(newstdin, "%s,"DEVNAME, stdinname); + stdinname = newstdin; + } else { + stdinname = devname; + } error = iomux_doenv(stdin, stdinname); + if (stdinname != devname) + free(stdinname); if (error) return error; #else