Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3218289rwb; Sat, 12 Nov 2022 01:11:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf7/FCIZ5eAPQ1VpA9O7pUYr7EwxVGiT+6NM6W7s/iEXEWFCQaNB/K47xHOYamhI1AZrogew X-Received: by 2002:a65:6a0f:0:b0:470:537c:1091 with SMTP id m15-20020a656a0f000000b00470537c1091mr4749683pgu.282.1668244310487; Sat, 12 Nov 2022 01:11:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668244310; cv=none; d=google.com; s=arc-20160816; b=Uhbou18za5TO2A6JTFg2DhUQbdnNNXkHh3p5W/TIxuNsFWtcsY3oSLKgrEqdKSMMZv 3oLuurP7X2aPHvB3dDZSKkM/cykgw7M1IaHMwV2ShgEN0nVQ1BKDy4+HqhHhqaQ/kLmx 6OCFeaYuh3ELayE+xt5Fn31/LpPp8M6vqecJiY/1k0YM6h3vOLF8re66Alpc7VAfmOCL G40emP+jZYbIqcyH6pJXQUX8R6yCXkiO5aIYY8idHW+SVl0LxHmICUoFAGexSMhnDz+J SMEA795PNrahO2VnVXRkhgJsfm9Uauvf3+pZuGEAOVSiyzNKpLXhZGv6FACiSxcm7yNs vZig== 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=YI+DGNIHptIMVSI7kKnoRQdzzRVRnT6uh2lxkN3gpXw=; b=AC2dHiuuBboXIX06JHzLQk+Ep+PZYcH2o9u+nO51wI48hKN43OK+iRixJm6D3kgjHF XWdj71Od2ZcHOnaDVIfy5vaNGOevcd68EK9knf0HopirNbKnvzvKWcxgFFBO/jRYMZqL 63pikGEKSSnZit0aQ0S4MimQMBeOnpUmN3n8FiMqeoUVub/xdvZVasp+ujFi5Qgf/e0W Ro+BJfdhfnN5FYz6LrjeYKFhXSk+ODxUy0+PZkV6AtgeuOtfwppbM61DSW5FGGIScARB LAk81z02Y2ClP63D1qqBHUcx6iRo6wgyr6g+Sg52Av6mWILUGsRhwQ+YJuk4lBFP3dUh hIHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o13-20020a170903210d00b00186a4763532si4066408ple.28.2022.11.12.01.11.20; Sat, 12 Nov 2022 01:11:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-bluetooth-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-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234584AbiKLJGH (ORCPT + 99 others); Sat, 12 Nov 2022 04:06:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230344AbiKLJGG (ORCPT ); Sat, 12 Nov 2022 04:06:06 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A91CE1145 for ; Sat, 12 Nov 2022 01:06:05 -0800 (PST) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N8V2N3PG7zbmlq; Sat, 12 Nov 2022 17:02:20 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 12 Nov 2022 17:06:04 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 12 Nov 2022 17:06:02 +0800 From: Yang Yingliang To: CC: , , Subject: [PATCH -next] Bluetooth: hci_bcm4377: Fix missing pci_disable_device() on error in bcm4377_probe() Date: Sat, 12 Nov 2022 17:04:37 +0800 Message-ID: <20221112090437.3591380-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-bluetooth@vger.kernel.org pci_disable_device() need be called while module exiting, switch to use pcim_enable(), pci_disable_device() will be called in pcim_release() after probe() failure. Fixes: ab80b2cec05f ("Bluetooth: hci_bcm4377: Add new driver for BCM4377 PCIe boards") Signed-off-by: Yang Yingliang --- drivers/bluetooth/hci_bcm4377.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_bcm4377.c b/drivers/bluetooth/hci_bcm4377.c index 74f44562ac33..19ad0e788646 100644 --- a/drivers/bluetooth/hci_bcm4377.c +++ b/drivers/bluetooth/hci_bcm4377.c @@ -2306,7 +2306,7 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id) */ msleep(100); - ret = pci_enable_device(pdev); + ret = pcim_enable_device(pdev); if (ret) return ret; pci_set_master(pdev); -- 2.25.1