From patchwork Fri Jun 2 07:00:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 102339 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp845149vqr; Fri, 2 Jun 2023 00:12:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4N8LFo7vAvOJH1petjm1Kly/ohUtN+Geyo6ayiU8gbvD+vzpiEFimZr6YRoCs0znICYYd9 X-Received: by 2002:a17:903:11d0:b0:1b0:577c:2d1 with SMTP id q16-20020a17090311d000b001b0577c02d1mr966392plh.31.1685689968558; Fri, 02 Jun 2023 00:12:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685689968; cv=none; d=google.com; s=arc-20160816; b=QahTYWU8WBDH6/PNZj2jaGkRImQRPArNaj3quAfGcXg3qgYuHLEVztthPingd/pffr mU0RCdDq4V1+H5gA6lfSl2bXo1mzJ+p0fXYV8F/FzifIUIyArZY67OMzlA73DKY5KpWe WuLjsFMIbt8xXZU4r7wVx1DG+5UEltjJQPVxIJSZmfCzx+NfZitKqni1yWc5Ti6amEG6 mZuGq0iptCw3aQPuxKCWYURce/HhmKtHYMXqQBPIrzrbJGg9obZwHOml33ZDMO1MCbpd Xw5VXUaGmkKh79U/r/b8Cv7qX8Z+1sEWR5eSG0PpFcyqejj8SfjxGjHdr5KdDeA3k5Qv M6PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=DjC7t2J8Ew6YJjFs5z4OnMHBWSSVMpKe9WNYkSyJr1I=; b=rxGqyl8XUw1XiInNlETnH1eT4oyHLbs3z90Q/viN/HSzAwBc4qOxh5SOYbYkgsUtYA kLGGrDmCA5XUUgVQFRiSxkaz7yDOxZioe19B9+DX/+hJtBxri6C8YYYkalktPVdsX6uM 6dpTRFr6dVDeplUoi7GHLvL02DS997H7U1ddN3h/QWaUOOalcoPJPMPFkjkn71E864lt tY/QqGJgGEaKTQyCHfOnL+ZtFZa7nnV58PmloA0TjlJWRthPX8MhDfHHauVrz25k4ENa X+SilkUdRUXA8qReEraVswPU3N5OaKXWc1QWUc70DaRCfPSb5WQ3qiYkkWqatmdyUq4C uiZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id iw12-20020a170903044c00b001b025aba9f2si480273plb.22.2023.06.02.00.12.34; Fri, 02 Jun 2023 00:12:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233961AbjFBHAP (ORCPT + 99 others); Fri, 2 Jun 2023 03:00:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233391AbjFBHAN (ORCPT ); Fri, 2 Jun 2023 03:00:13 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5584813D; Fri, 2 Jun 2023 00:00:12 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id E491D8111; Fri, 2 Jun 2023 07:00:09 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-omap@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/1] serial: core: Fix error handling for serial_core_ctrl_device_add() Date: Fri, 2 Jun 2023 10:00:05 +0300 Message-ID: <20230602070007.59268-1-tony@atomide.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767572937118139230?= X-GMAIL-MSGID: =?utf-8?q?1767574044227009473?= Checking for NULL is incorrect as serial_base_ctrl_add() uses ERR_PTR(). Let's also pass any returned error along, there's no reason to translate all errors to -ENODEV. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Signed-off-by: Tony Lindgren Reviewed-by: Jiri Slaby Reviewed-by: Andy Shevchenko --- Changes since v1: - Stop translating all errors to -ENODEV - There's no need to use IS_ERR_OR_NULL() as noted by Jiri --- drivers/tty/serial/serial_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3342,8 +3342,8 @@ int serial_core_register_port(struct uart_driver *drv, struct uart_port *port) ctrl_dev = serial_core_ctrl_find(drv, port->dev, port->ctrl_id); if (!ctrl_dev) { new_ctrl_dev = serial_core_ctrl_device_add(port); - if (!new_ctrl_dev) { - ret = -ENODEV; + if (IS_ERR(new_ctrl_dev)) { + ret = PTR_ERR(new_ctrl_dev); goto err_unlock; } ctrl_dev = new_ctrl_dev;