Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp5402917pxv; Wed, 21 Jul 2021 04:43:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyndo4/wamGjKx7zbX05I/ZcZf19tVCFbJvfWgTH2LzULD307/+c7Z0j6BWg+k2QkZqlx4s X-Received: by 2002:a17:906:859a:: with SMTP id v26mr38203799ejx.336.1626867837714; Wed, 21 Jul 2021 04:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626867837; cv=none; d=google.com; s=arc-20160816; b=EdYzBjaSIPXMKeLeC7yhQp1SfbtUXAiCI+DpyHIfiCkZXViLqpupXIvBKsGS4we8/W tp0LQwOEbKO2ysFU47SoWn+xg0RXPUZMrEbHTWFb5O181vcrK5Fh0smtHHJoThBgrtwZ RdNU8P1gCUwQGsxEXb/mPN8xCGaqWDzp0JpndkQF7ysFkYSNLNeUU2mQWBEaqSToUJgi 9WQMjI3MaeIgk9ITJQ0SF09aRtXnDURWGYqqLjxJG1JvTwyu+ucw4xdLTGUBJaIw5Qf1 nOAyQzv6uN2bwD4nltgUkDTdJbLsYrNJSc/7FoMjdhr8Oyzas4jd8u3xdK2m9WbVqPym rCfw== 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:dkim-signature; bh=NSUIN6maeq33hi7ZKUpLjEr+OnEnHzB7GGqa1HE5xpI=; b=dIam7F2/sb40YJPcpvmGA6cV/85mfE1sOM49ODvyB+hpk9YFm1npZ2oOm4jnPbI8r2 a20u/XZW2IW1i7iK07trXRbwCHDbn0SlD39futhvcqH1XH+iNSg209HQsKXyBA4OVCj0 9IDd3OXpCfTb21oXgahi+NC+kKXQdAq22nI0jBoSqTth7etJ48sspCipLp8vfUvBCK1o M3DWjRjoNGwXD5JHGUUnEhicAXOtwk8QVFWiFKRixvfVrbcQt74d5WuyhpvqpkDzkNhl 8fvw6/0JM+H8xTWmvS/98v2Uu73htQbF9Aq7eUQfqRR6Psxrr9doJpMjTQzfgCS4S0oz xJnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=rKtYaN6u; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r14si27665044edw.524.2021.07.21.04.43.29; Wed, 21 Jul 2021 04:43:57 -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; dkim=pass header.i=@gmail.com header.s=20161025 header.b=rKtYaN6u; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239126AbhGULBY (ORCPT + 99 others); Wed, 21 Jul 2021 07:01:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237492AbhGUKxH (ORCPT ); Wed, 21 Jul 2021 06:53:07 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E569C0617A6; Wed, 21 Jul 2021 04:33:20 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id c1so1969666pfc.13; Wed, 21 Jul 2021 04:33:20 -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:mime-version :content-transfer-encoding; bh=NSUIN6maeq33hi7ZKUpLjEr+OnEnHzB7GGqa1HE5xpI=; b=rKtYaN6uHhE+6arpZ8JEhrQ0rKg5OGSG49zDKPGDn6ewn3vVVOU+gS8yrT4OrY5XOD X2W0Fsnf14jozXP85iRQ5PXh17qi91jmaKLTmyRSLVBJJTG6uneTc1FgUkSTXUsIX0xt P/WzfJvabqjl+v4puXKQY/HcqlOQyz3JqIAxsZfRWy3WiEt2RGK3LcIkfKKNJ+qOx+Qb rcoD8UiLFLWwEJ6PDpPNVtG6FzWHBhPPRXU/5uuKPpc49t/q5pnfw/Al89gXJW5DtI7L PBBqky+AlkloESHGVhaPHsupJASQiR1ZH4H/o+tiN1ivqgJv/N1KbIviG5bboGAbqxur E2Pg== 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:mime-version :content-transfer-encoding; bh=NSUIN6maeq33hi7ZKUpLjEr+OnEnHzB7GGqa1HE5xpI=; b=e1r36PcT7p9TBnXyKh+PPaalQ9F+k2Zls6D8dzNyYsNYX0psL5i1vaYFkEa0Vuifkp IAB2t/83RIaloULtgjmWXOYOjyAgvahfjOZ1exMHdLk+N1lm6OZBIWiF2jSspY376wtL Q2EoyU0NOoDirEoNbzLoaZ4N2A5+hOrNQ4FYvwji5neqFbPw0uaGhx9DxEUvFKujGMKh xL/OYXxBjNTZz500TwHfLiIEVgYjEM6qBqwAD5NVsi8mU3B8fxjAiYxvidcs6i88kaJG JwsOoB8Rq/c9aRa94IeTfNM4tFx4Y86yMloWz+V68NDvt5OOeI11o1v3weyJkXmI6WBL 1O3g== X-Gm-Message-State: AOAM531l35OLrp6B6CtH5XkpCnpCYWC2uQFDcgN3U4lmTwMoQO22KGIO RVgl3QQor/apl1gvD5YZus8= X-Received: by 2002:a63:2cd2:: with SMTP id s201mr30423917pgs.119.1626867199843; Wed, 21 Jul 2021 04:33:19 -0700 (PDT) Received: from localhost.localdomain ([154.16.166.166]) by smtp.gmail.com with ESMTPSA id c7sm28730171pgq.22.2021.07.21.04.33.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 04:33:19 -0700 (PDT) From: Dongliang Mu To: Greg Kroah-Hartman , Jiri Slaby Cc: Dongliang Mu , stable@vger.kernel.org, Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH v2] tty: nozomi: tty_unregister_device -> tty_port_unregister_device Date: Wed, 21 Jul 2021 19:33:04 +0800 Message-Id: <20210721113305.1524059-1-mudongliangabcd@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The pairwise api invocation of tty_port_register_device should be tty_port_unregister_device, other than tty_unregister_device. Fixes: a6afd9f3e819 ("tty: move a number of tty drivers from drivers/char/ to drivers/tty/") Cc: stable@vger.kernel.org Signed-off-by: Dongliang Mu --- drivers/tty/nozomi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index 0c80f25c8c3d..08bdd82f60b5 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -1417,7 +1417,8 @@ static int nozomi_card_init(struct pci_dev *pdev, err_free_tty: for (i--; i >= 0; i--) { - tty_unregister_device(ntty_driver, dc->index_start + i); + tty_port_unregister_device(&dc->port[i].port, ntty_driver, + dc->index_start + i); tty_port_destroy(&dc->port[i].port); } free_irq(pdev->irq, dc); -- 2.25.1