From patchwork Fri May 22 21:50:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: wu000273@umn.edu X-Patchwork-Id: 218670 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 6F273C433DF for ; Fri, 22 May 2020 21:50:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 394872073B for ; Fri, 22 May 2020 21:50:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="YpholpuH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731181AbgEVVun (ORCPT ); Fri, 22 May 2020 17:50:43 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:55876 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731051AbgEVVun (ORCPT ); Fri, 22 May 2020 17:50:43 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 49TKtB2Tz1z9vBsL for ; Fri, 22 May 2020 21:50:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wEAq5La5EqQn for ; Fri, 22 May 2020 16:50:42 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 49TKtB0qNVz9vBs5 for ; Fri, 22 May 2020 16:50:42 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p6.oit.umn.edu 49TKtB0qNVz9vBs5 DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p6.oit.umn.edu 49TKtB0qNVz9vBs5 Received: by mail-io1-f70.google.com with SMTP id n20so8215753iog.3 for ; Fri, 22 May 2020 14:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QnQxecg34bqUdZINiYr2xryJqppsStQKMeRWBxxN/GY=; b=YpholpuHjF0WHc0kgsVphNDznXfkkcsqz5mrytjkO9sNgbLyvjptT8FgeVF2IehPwu PD6SdQGReD1MMFB0xgkm9X3LZOOuon7e+fZGp3l0x9EqjJfJoomsab6NwLQKPQAt6U4A mMy9FJshFD+T1bxogDXRZl2W/CF1Aor1oZJVfZ8ZQnTgbW6zmlfbwGZI1Pc29YqQ4Jke KbBqZPk+vxD7zu2CSa4l2bl0ZvRS9rX+y5IrRvO+cExg+567TCmBrcsHL7AiPoJQXKM+ GR67XwmPKXGtqeDvOj5srFN6keVcJa2k9tfs2EFMF+B7qYxPen4INS6e43b3PRJXxrlh 2sbQ== 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=QnQxecg34bqUdZINiYr2xryJqppsStQKMeRWBxxN/GY=; b=lTJDpo+RUPqSBudqGsRQgBoE5NEXRR7c5lfSzu5zekI53rL4zg1aqKNB4j1q0xu+y1 hYhugkGktasAvnTnDFkx+NjMYSukgXwncRbIf49RdzHV5OoaD7t9xcPLYciE+t+CO9Ub KIVcKuCxF30iQNxie8ZNimD15PQ2UCfW6h1n2Bc0162dTC2u14DSCRihmMRJOsWC1V7T eXsTopkRNUcd3/apNd1DWihDkuaogx/MN8jsuQlrEq8P1JHZtPmJGyaVx9ktR3pqEyP3 sv151p3DLB4rudR48pfh8IWgZMLyv8T57nc/5FWgfaCgH1KsJgcua6lBoVEMEIduXKF5 OqEQ== X-Gm-Message-State: AOAM531Ksd/vyiKqdkv6Cv9qI5i4iRuPEJr1FEiu9a7hHyiLgqIYlMlk LLiqQCjTHT+C9COO5ovXOqkP4/cWLnLH1pNDVOlFJLcoTDBzUAZniQlvh4CVBSELFTykFKV1XJg r247pbcWWT1W2bwddBdrM X-Received: by 2002:a92:1b17:: with SMTP id b23mr15119055ilb.199.1590184241628; Fri, 22 May 2020 14:50:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3IHta8Esaor63AmNN/5skTrVjceOXa80q0zwAtFpkTtxrBOXmSqZQlwJ8t2pbwIbGhFMwIA== X-Received: by 2002:a92:1b17:: with SMTP id b23mr15119040ilb.199.1590184241297; Fri, 22 May 2020 14:50:41 -0700 (PDT) Received: from qiushi.dtc.umn.edu (cs-kh5248-02-umh.cs.umn.edu. [128.101.106.4]) by smtp.gmail.com with ESMTPSA id z3sm4218651ior.45.2020.05.22.14.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 14:50:40 -0700 (PDT) From: wu000273@umn.edu To: davem@davemloft.net Cc: kuba@kernel.org, hkallweit1@gmail.com, jonathan.lemon@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kjlu@umn.edu, wu000273@umn.edu Subject: [PATCH] net: sun: fix missing release regions in cas_init_one(). Date: Fri, 22 May 2020 16:50:27 -0500 Message-Id: <20200522215027.4217-1-wu000273@umn.edu> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Qiushi Wu In cas_init_one(), "pdev" is requested by "pci_request_regions", but it was not released after a call of the function “pci_write_config_byte” failed. Thus replace the jump target “err_write_cacheline” by "err_out_free_res". Fixes: 1f26dac32057 ("[NET]: Add Sun Cassini driver.") Signed-off-by: Qiushi Wu --- drivers/net/ethernet/sun/cassini.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index e6d1aa882fa5..f1c8615ab6f0 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -4963,7 +4963,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) cas_cacheline_size)) { dev_err(&pdev->dev, "Could not set PCI cache " "line size\n"); - goto err_write_cacheline; + goto err_out_free_res; } } #endif @@ -5136,7 +5136,6 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_free_res: pci_release_regions(pdev); -err_write_cacheline: /* Try to restore it in case the error occurred after we * set it. */