From patchwork Wed Nov 28 14:40:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 152299 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1171025ljp; Wed, 28 Nov 2018 06:40:35 -0800 (PST) X-Google-Smtp-Source: AFSGD/VfsvwuHzNFIQYeDbZkJmTfefEbWaB4fNRZoGh78S6L97U8EpWYY8jLnrGf4n8xUdfIY8KQ X-Received: by 2002:a17:902:720c:: with SMTP id ba12mr20610653plb.79.1543416035658; Wed, 28 Nov 2018 06:40:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543416035; cv=none; d=google.com; s=arc-20160816; b=yM/zEupqwy3wnJIoHpHfAPj7rVAy3dd0gBlpSJ1zDre+TrenVPZc26QjZkhaX/8ZZ4 ilztXT2bQ6aLpk6I7mF+5QJaNC9mwpOtor1xtpeNRToUWaGKzYxp0oiZawJsscgA9+0t 5+4OdVpEh+Eqilio1esCKhUBxvruSaRr8BVWKjFaLwbswURlrq5/IAOLrSiw+cE14lF6 WcOI/xzLV/V1/MnfIU7ssH1qcHfdNxKJDSQdZHDH3UquKKAMOGI4hmGarvUhd8RQyLZJ gFyb0DYy0+8ly07gTacJPzR8j7M0XHZmawkagV3cuwdVYhNzzQNmCVqlaxDprL/hemea mCqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=6xt0TBs45e/9YTcYGwApVbLQoJIHwf7ONWA1rPhxQGk=; b=Aa6AdYjcmD00GPedEE4lk/utXfCFC6dl9HqlSMAYzJ3VYbOwCNoTTz/wP8hPzyGLnj sGOYDNouj08UJAKJgm7PRa+jNsBXu0XPNtXcvYUWh7NcTB4d1nln1Pg+nuVCLnhVZrA1 ZutpOacgY4wbUBplQlaQ34Dm/btzXNL1WSyncMAra1/gDqlEXKvJGhY4fISzk9x4AJKF bZrxujHlP8bbGjnbYIQDpm8+l2gKIkJJ6wN6Ec6EcKbQZ6KWeUk0/UjCSDy5aeI/hHCk u8f7EIaw71NFbt4bF81PdL9E9FErzNa/WqDVui0o5k6VLYZ3oqlqdg1FtAgw4fjgF+2u hTZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e0TILW0n; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l23si7489048pgh.533.2018.11.28.06.40.35; Wed, 28 Nov 2018 06:40:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e0TILW0n; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727941AbeK2Bm1 (ORCPT + 15 others); Wed, 28 Nov 2018 20:42:27 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:45851 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728443AbeK2Bm1 (ORCPT ); Wed, 28 Nov 2018 20:42:27 -0500 Received: by mail-pl1-f194.google.com with SMTP id a14so17457998plm.12 for ; Wed, 28 Nov 2018 06:40:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6xt0TBs45e/9YTcYGwApVbLQoJIHwf7ONWA1rPhxQGk=; b=e0TILW0nRiOlPhRFTizOIwftxoclpgeWQnOhSkEsj/xwiFYVYxMyacsS8u0ERHh9rv qYnSJUI90drUc/EIomozUE8v3ghYNvFCKqLSr0IZrfcNE32YLWFdfnNVLc7s/36JlUzd +WuwzhRdsTA/hK2PmB2RfGUGnvX57lDoWZ25Y= 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:in-reply-to :references; bh=6xt0TBs45e/9YTcYGwApVbLQoJIHwf7ONWA1rPhxQGk=; b=YeMMHF293+yeeXCv1IPskMS2ZF93SPUsIlxm9WAlnLA/2/V14F3IZ6wNz/nI+aGcdx pwbUORzVHRLuegu39hYGKCjsU0jHyib4S/2FOoGvW5FlvCuv/rU+PP/Vra5V8qHDWzRn r2WkolUz3r6+UPhoqY92ex7LKYXEfxZ3Mjlk+zI5iaURTlaAaU99m/SJH7UgiPbLOO3K kpLuHiY/P5b9Xm0GXeFHeRv8PI1IbMPbLMf0EEMofqBmG/jXTktqAGZpM/cJodJplmb9 bf8TXikLm0u0y4uprxJ8mQGX03o0aeh3y+jJSiLoKsS5pduPDbUCdI0PoKa+zUs6I1mw 9khQ== X-Gm-Message-State: AA+aEWZLukY+vmeLyhbz1JchgEIaW9eHvbdaiA98Uimur+/Vz/gTPTbS WFTMInwz+PwhleDXlBBTXWEvHA== X-Received: by 2002:a17:902:d891:: with SMTP id b17mr37851787plz.80.1543416034279; Wed, 28 Nov 2018 06:40:34 -0800 (PST) Received: from localhost.localdomain ([49.207.53.6]) by smtp.gmail.com with ESMTPSA id b26sm24227637pfe.91.2018.11.28.06.40.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Nov 2018 06:40:33 -0800 (PST) From: Amit Pundir To: Greg KH Cc: Stable , Subhash Jadavani , "Martin K . Petersen" Subject: [PATCH for-4.9.y 10/10] scsi: ufshcd: release resources if probe fails Date: Wed, 28 Nov 2018 20:10:04 +0530 Message-Id: <1543416004-1547-11-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543416004-1547-1-git-send-email-amit.pundir@linaro.org> References: <1543416004-1547-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Subhash Jadavani commit afa3dfd42d205b106787476647735aa1de1a5d02 upstream. If ufshcd pltfrm/pci driver's probe fails for some reason then ensure that scsi host is released to avoid memory leak but managed memory allocations (via devm_* calls) need not to be freed explicitly on probe failure as memory allocated with these functions is automatically freed on driver detach. Reviewed-by: Sahitya Tummala Signed-off-by: Subhash Jadavani Signed-off-by: Martin K. Petersen Signed-off-by: Amit Pundir --- drivers/scsi/ufs/ufshcd-pci.c | 2 ++ drivers/scsi/ufs/ufshcd-pltfrm.c | 5 +---- drivers/scsi/ufs/ufshcd.c | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index d15eaa466c59..52b546fb509b 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c @@ -104,6 +104,7 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) pm_runtime_forbid(&pdev->dev); pm_runtime_get_noresume(&pdev->dev); ufshcd_remove(hba); + ufshcd_dealloc_host(hba); } /** @@ -147,6 +148,7 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) err = ufshcd_init(hba, mmio_base, pdev->irq); if (err) { dev_err(&pdev->dev, "Initialization failed\n"); + ufshcd_dealloc_host(hba); return err; } diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index db53f38da864..a72a4ba78125 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -163,7 +163,7 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, if (ret) { dev_err(dev, "%s: unable to find %s err %d\n", __func__, prop_name, ret); - goto out_free; + goto out; } vreg->min_uA = 0; @@ -185,9 +185,6 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, goto out; -out_free: - devm_kfree(dev, vreg); - vreg = NULL; out: if (!ret) *out_vreg = vreg; diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 39732e93d460..5cfd56f08ffb 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6507,8 +6507,6 @@ void ufshcd_remove(struct ufs_hba *hba) ufshcd_disable_intr(hba, hba->intr_mask); ufshcd_hba_stop(hba, true); - scsi_host_put(hba->host); - ufshcd_exit_clk_gating(hba); if (ufshcd_is_clkscaling_enabled(hba)) devfreq_remove_device(hba->devfreq); @@ -6876,7 +6874,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) ufshcd_exit_clk_gating(hba); out_disable: hba->is_irq_enabled = false; - scsi_host_put(host); ufshcd_hba_exit(hba); out_error: return err;