From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77FEEC433DF for ; Fri, 16 Oct 2020 03:13:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D91920FC3 for ; Fri, 16 Oct 2020 03:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602818001; bh=9Ihgxfa92KwEg88URGFcOCSc9mej9RQlS17RWBSxU5o=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=0LXGCkiHZxBqizf1nPWmrxGO52tAIq+q13Edbjh70x6AeHKA/pPkmYCv2COsaAygb Tk4FDkWY30LXYHDF11E4n2Y5xwWkFYZNFyvWM7XvaVSgVLDt5COjyCrS7jq+5MKhSJ ayzIIW0vOxCaSe9HIVGaxaEyvGz00WlyNchjDxU0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393957AbgJPDNU (ORCPT ); Thu, 15 Oct 2020 23:13:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:48990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393799AbgJPDNU (ORCPT ); Thu, 15 Oct 2020 23:13:20 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D7492078A; Fri, 16 Oct 2020 03:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602817999; bh=9Ihgxfa92KwEg88URGFcOCSc9mej9RQlS17RWBSxU5o=; h=Date:From:To:Subject:In-Reply-To:From; b=uWUgZagql0N280RXHsdoJWERbtXPmq1tAkoFtDB7FBygE9+uG854SaGMENFRHAfzk w847gnDOsQUghzTNS63IaPmZeBeki62Sq0Znc0sN8Z2R5fJ7YR3DQt4PTLDI2bfM1G Ut1u4PAMJiWvGHtX4m2MLsDx0J1FbALQQC8kjmAU= Date: Thu, 15 Oct 2020 20:13:18 -0700 From: Andrew Morton To: akpm@linux-foundation.org, alex.bou9@gmail.com, dan.carpenter@oracle.com, gustavoars@kernel.org, jhubbard@nvidia.com, jingxiangfeng@huawei.com, keescook@chromium.org, madhuparnabhowmik10@gmail.com, mm-commits@vger.kernel.org, mporter@kernel.crashing.org, torvalds@linux-foundation.org Subject: [patch 147/156] rapidio: fix the missed put_device() for rio_mport_add_riodev Message-ID: <20201016031318.ehdxeofYU%akpm@linux-foundation.org> In-Reply-To: <20201015194043.84cda0c1d6ca2a6847f2384a@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: Jing Xiangfeng Subject: rapidio: fix the missed put_device() for rio_mport_add_riodev rio_mport_add_riodev() misses to call put_device() when the device already exists. Add the missed function call to fix it. Link: https://lkml.kernel.org/r/20200922072525.42330-1-jingxiangfeng@huawei.com Fixes: e8de370188d0 ("rapidio: add mport char device driver") Signed-off-by: Jing Xiangfeng Reviewed-by: Dan Carpenter Cc: Matt Porter Cc: Alexandre Bounine Cc: Gustavo A. R. Silva Cc: John Hubbard Cc: Kees Cook Cc: Madhuparna Bhowmik Signed-off-by: Andrew Morton --- drivers/rapidio/devices/rio_mport_cdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/rapidio/devices/rio_mport_cdev.c~rapidio-fix-the-missed-put_device-for-rio_mport_add_riodev +++ a/drivers/rapidio/devices/rio_mport_cdev.c @@ -1680,6 +1680,7 @@ static int rio_mport_add_riodev(struct m struct rio_dev *rdev; struct rio_switch *rswitch = NULL; struct rio_mport *mport; + struct device *dev; size_t size; u32 rval; u32 swpinfo = 0; @@ -1694,8 +1695,10 @@ static int rio_mport_add_riodev(struct m rmcd_debug(RDEV, "name:%s ct:0x%x did:0x%x hc:0x%x", dev_info.name, dev_info.comptag, dev_info.destid, dev_info.hopcount); - if (bus_find_device_by_name(&rio_bus_type, NULL, dev_info.name)) { + dev = bus_find_device_by_name(&rio_bus_type, NULL, dev_info.name); + if (dev) { rmcd_debug(RDEV, "device %s already exists", dev_info.name); + put_device(dev); return -EEXIST; } _