Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3024462ybt; Mon, 29 Jun 2020 13:12:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYogjpG6o/Jg5K9XSjw9ZgkDr5HAON+0s4zzwDC5+To3xnHbLNudUQaSSWVDiKC4Drq89K X-Received: by 2002:a50:e047:: with SMTP id g7mr18955166edl.290.1593461550937; Mon, 29 Jun 2020 13:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461550; cv=none; d=google.com; s=arc-20160816; b=voHwnY67Fo8hNlRyXxXpFEDkeCMSIE4A/QoJuLpD6+G7DvlBQ6381+45w/lyKrwhmJ J7tjIWUoR84tYkoAD3JpPng3pU31rha9UvNs5lHy7LFgy3i9D6u1ZDZqrE8WxbDMWlwJ qZxBguzgBGnqsaDaQ7GImFe/Fy0Me4f0+jWXmJ77Rv9Rkrrdgm5IPkjXwsj3EgHTZend PuOefLPyj310RxxLhAPkdHWpKPdbTfb9q0mKZNqJ7uYdTXJquRgikZqcEiM8MbkdUJTx n5zP1YjZNdHdxhM3BJDjWsTp7wDFwPpmhH6Z4sk07colYzHPgaRaV4hOxULssku1gQbo Vo2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wb5VCuNhADU1HKkDShM3tp0QJSoJsVB3HRbGYTiIPSE=; b=nQw3LiN1QB8VuDEbcjYQ6NA2MUBNe3PcjCTK6GUdqr8KT0ZvfikaflD/sOMT96gb1g Zpy2Ps9c3NboJ+n7V/Wn1QC2fJ6kh4i8g9KL2No2QaPzhrwqev/AZUxgH1ANF6Hw9Hmo Qz5OfQTEW/UlveHzX+wUPNM+26d+ip98sV6UYRpMbrMzN7oWawAm7w5HGt5HP8jNgqOC YvGnUByrjZ3EqRtIFD/fPB14o3k6lSmKPuodzYAsyftn7YhplEBBEcDD493dU+cL3yti t+gYM19xGhbxZ+3XMlJRvUb6KjwaL4js8t0fby17qwBW6W4u/vka6YfeWDvGlakqWw5a KYBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cOnpUs+w; 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=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f14si378539ejq.136.2020.06.29.13.12.07; Mon, 29 Jun 2020 13:12:30 -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=@kernel.org header.s=default header.b=cOnpUs+w; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729216AbgF2UKi (ORCPT + 99 others); Mon, 29 Jun 2020 16:10:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:40580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732909AbgF2TaW (ORCPT ); Mon, 29 Jun 2020 15:30:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 56A272527C; Mon, 29 Jun 2020 15:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444990; bh=W1eadARlGahJjOg5KrWyJCvs5DwkTNwLFWf11lo/REc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cOnpUs+wwNlp6tw6UyaQHLk52QxsMVOCIVVqQTZzT7n6f5LQcCH/2wD2fpvGh9pm6 Uzn9pnMIaO5A8cmVXdm3+IrkX0myLRoJTFukimQ4KRqaCzMEhTPuUDe/LuBHkqjhNW 4WZfqZ+YiNQBqxCI5c8Y07xtE/+9N50otBEusY9w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 090/131] sata_rcar: handle pm_runtime_get_sync failure cases Date: Mon, 29 Jun 2020 11:34:21 -0400 Message-Id: <20200629153502.2494656-91-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153502.2494656-1-sashal@kernel.org> References: <20200629153502.2494656-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.131-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.131-rc1 X-KernelTest-Deadline: 2020-07-01T15:34+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit eea1238867205b9e48a67c1a63219529a73c46fd ] Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count. Call pm_runtime_put if pm_runtime_get_sync fails. Signed-off-by: Navid Emamdoost Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/sata_rcar.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 03867f539f3a8..50ebd779d975f 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -909,7 +909,7 @@ static int sata_rcar_probe(struct platform_device *pdev) pm_runtime_enable(dev); ret = pm_runtime_get_sync(dev); if (ret < 0) - goto err_pm_disable; + goto err_pm_put; host = ata_host_alloc(dev, 1); if (!host) { @@ -940,7 +940,6 @@ static int sata_rcar_probe(struct platform_device *pdev) err_pm_put: pm_runtime_put(dev); -err_pm_disable: pm_runtime_disable(dev); return ret; } @@ -994,8 +993,10 @@ static int sata_rcar_resume(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } if (priv->type == RCAR_GEN3_SATA) { sata_rcar_init_module(priv); @@ -1020,8 +1021,10 @@ static int sata_rcar_restore(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } sata_rcar_setup_port(host); -- 2.25.1