Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1489260ybt; Thu, 18 Jun 2020 09:50:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2pxyyniyNRLd+wOs07TlUccwh4jCUAT/7Xra7OuoLznZiRUeBGWBJgHeXNv9zBI6hWwfR X-Received: by 2002:a50:f0c4:: with SMTP id a4mr5079785edm.125.1592499058131; Thu, 18 Jun 2020 09:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592499058; cv=none; d=google.com; s=arc-20160816; b=TupDMnY+bYecLv9zJPikdjFO4fUNyT9CK4MCZj5QfD30WZy8esaikJjzhDUgzrcfGU wLcyeliwmLJSmImeVXLd1y2dId688OUo0t5hHDQWCeijKOqbuJ/EK5v3ovEyaTzTXlQU CvH3Hsiv662L1BBJA4di4clcoc2pOR2IVT66s+kwFMyqsJhZQncOxYOOk3RLsSHpjTSx D/TWMZssaofLhx59WiEWffvE4/v9mx+Ixrd04NAk2Kj9gmmSk+kXylKzkDBFRm7E3SnX 3a5HMIAplYRzNXsuFmaYYhPJVe9BnxCv2tkblNJYSDmj4Hzs+ySIhAqqghSGtkYTnX6Q kYJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=zMpWEqpwbUjQJfb7rX6HCzb9ZYv2EiGBX1LXVa5A5A8=; b=p5Fi2f95bXm7cr16Fd9mod7HWbBhV4ISx0Bdy3R+S+c5M4Cbuk4SiDKqmdk9vBSdN1 SnoKGH8WW713vYbbp1mEN3LCrlc8Bu3A5rQwFZF94g2NEt/UfpYQ84A3ZbueLIArWu+8 gmDnQ2HQsrm6YbsiLj8y6OS/oYObYSPfJA/nXn/I+tEQSohtxcad8t0ZQyWAkVnQiC3C zfjmVBpjN/+Pz/aB4qRNZ+9SJvkvu3qxwfFxMkiV+ms9SzSg2AZ1GLkE7gQ/PtY3JfUL HMUQAPvGf20vR5mBnOfVVbLv4mTWmsy4Ays0/Bt6uMTy+jT9wlWOgJQQSN1uWClAxiye kCCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id be6si2102334edb.405.2020.06.18.09.50.35; Thu, 18 Jun 2020 09:50:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732098AbgFRQsQ (ORCPT + 99 others); Thu, 18 Jun 2020 12:48:16 -0400 Received: from mga03.intel.com ([134.134.136.65]:18732 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732055AbgFRQr6 (ORCPT ); Thu, 18 Jun 2020 12:47:58 -0400 IronPort-SDR: g1z67WL4rXumrC31JvueiR9NCqfTLZ51XXn9F8z6Crr+KujB+CVL9gSUvn+akmIA/XPjcVbzRi xQ0J24GJgHkQ== X-IronPort-AV: E=McAfee;i="6000,8403,9656"; a="142595289" X-IronPort-AV: E=Sophos;i="5.75,251,1589266800"; d="scan'208";a="142595289" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 09:47:57 -0700 IronPort-SDR: 3a8y2+tuF1G777QHoLpoaEYLIt1skH8wZYy2EWSA6PprgElHUtXbQ6WjFlSm+SmwOWJTppes3h 9H/fHhR0VjfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,251,1589266800"; d="scan'208";a="477257278" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 09:47:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id DE47430F; Thu, 18 Jun 2020 19:47:51 +0300 (EEST) From: Andy Shevchenko To: Petr Mladek , Sergey Senozhatsky , Steven Rostedt , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org Cc: Andy Shevchenko , Benjamin Herrenschmidt Subject: [PATCH v1 5/6] console: Propagate error code from console ->setup() Date: Thu, 18 Jun 2020 19:47:50 +0300 Message-Id: <20200618164751.56828-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200618164751.56828-1-andriy.shevchenko@linux.intel.com> References: <20200618164751.56828-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since console ->setup() hook returns meaningful error codes, propagate it to the caller of try_enable_new_console(). Signed-off-by: Andy Shevchenko Cc: Benjamin Herrenschmidt --- kernel/printk/printk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 8c14835be46c..aaea3ad182e1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2668,7 +2668,7 @@ early_param("keep_bootcon", keep_bootcon_setup); static int try_enable_new_console(struct console *newcon, bool user_specified) { struct console_cmdline *c; - int i; + int i, err; for (i = 0, c = console_cmdline; i < MAX_CMDLINECONSOLES && c->name[0]; @@ -2691,8 +2691,8 @@ static int try_enable_new_console(struct console *newcon, bool user_specified) return 0; if (newcon->setup && - newcon->setup(newcon, c->options) != 0) - return -EIO; + (err = newcon->setup(newcon, c->options)) != 0) + return err; } newcon->flags |= CON_ENABLED; if (i == preferred_console) { -- 2.27.0