Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2238779ybg; Sun, 27 Oct 2019 14:08:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqxk5Wpn/7fOQrEFT6ez2oYMuLu7RZfU5EILcB0f1pM/9LnW1XZsS34Ccy54rTrwVPls+NVQ X-Received: by 2002:a17:906:2ccc:: with SMTP id r12mr13062759ejr.249.1572210487375; Sun, 27 Oct 2019 14:08:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210487; cv=none; d=google.com; s=arc-20160816; b=o00g+Vai2Q05w4rWcLsLtDug5T366iIDUeKFDkbc8Cf9vUgN6sysU6vMIvA0UlRVkf aMp30yvcg3RWuLCzrwqf0TtMVa5EqvY3WXM1Bxe0s9LMquGMnYDE4YQIJm6yNgzWk5BR rSpPuOsGG9nB4WQ+9YI0AfyDNcxidr/NKdHUWmb+99diQpEaoTwSU9vWGhDxmteppPpo GU3V3O2j0RLynr+Ziqw7kWLyxcQ/vHxRHkuTrZ41py21vIus5rKDNqkhKDAYZfBaHVib I3VX26uqFbzaeKrZKVeoVJ/Cnuw/Sg73zTruqmCpur3Gvn0zXfLC7m2Tlf/b5ceuhCVD VnwQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NoT6fQOv2W7BOXZnGm+aEHmVZvTaiQ7tPdPU3JP4JBY=; b=iF+HlVKjaZxWvbsJ2JkW+nB/w8x7tFKLNBiKArOEP4Hu0Xkq7u37YrJa838SCgJGRb tOv0+LJQHs37nlGHCaarBgzp62qsNgqWoZLMtEekb6eAtEYwGT5e1D1x0OjruUKUx1EL y8yrv4sJ1l3Sh/rJF5jB6Mh4cikc/hYAxe+nBKczCnkGTamlBO9QvwJjs3BE3CtiLMlw vTAZxqcrOtwzga6o3rixzmgIzcLPB0YXYlS32KCZ9bCfB0tDP/SAVWU7KexTr4/dAFJt suUUfETS1Fk2I0UYDqCYYvTIOwUFy2bUS0HXG1Iwi0hsW+bzjcm2m6P5Yp+aug2T7HgF wUzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZsmbQJk5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r29si7106541edb.156.2019.10.27.14.07.43; Sun, 27 Oct 2019 14:08:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=ZsmbQJk5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728979AbfJ0VGS (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:52202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728032AbfJ0VGP (ORCPT ); Sun, 27 Oct 2019 17:06:15 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 F1201214AF; Sun, 27 Oct 2019 21:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210374; bh=ssO/fgfxNpvpT7q/HqGLGpAcTTDrtqgKuanlAZwDpQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZsmbQJk5I7VzJ3QC3SdMvjZd5HFGRqJC7A4j5pY3jLQG/xEq9QyUaALWHGpvdKM0P QxGDiw6SxKwnmf8WTDbgsc0LYlU4YdedPWAZDxdzXBtBZ2S9a7e/egywWI1WkPo4xh zxG24fXdb/ASqszNGnqJpEme1rNUMmm6ddYR29SM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Ulf Hansson Subject: [PATCH 4.9 44/49] memstick: jmb38x_ms: Fix an error handling path in jmb38x_ms_probe() Date: Sun, 27 Oct 2019 22:01:22 +0100 Message-Id: <20191027203202.077051658@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET commit 28c9fac09ab0147158db0baeec630407a5e9b892 upstream. If 'jmb38x_ms_count_slots()' returns 0, we must undo the previous 'pci_request_regions()' call. Goto 'err_out_int' to fix it. Fixes: 60fdd931d577 ("memstick: add support for JMicron jmb38x MemoryStick host controller") Cc: stable@vger.kernel.org Signed-off-by: Christophe JAILLET Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/memstick/host/jmb38x_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c @@ -947,7 +947,7 @@ static int jmb38x_ms_probe(struct pci_de if (!cnt) { rc = -ENODEV; pci_dev_busy = 1; - goto err_out; + goto err_out_int; } jm = kzalloc(sizeof(struct jmb38x_ms)