Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2253302ybg; Sun, 27 Oct 2019 14:27:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5uty9psTfWHN8VWUgj5u2dOeWi+qquhgjnYF8V/+7hkfs97DIQWmJqAZYekYaMTMxTn2g X-Received: by 2002:a17:906:6dd3:: with SMTP id j19mr13352466ejt.144.1572211660006; Sun, 27 Oct 2019 14:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211659; cv=none; d=google.com; s=arc-20160816; b=MthPPSHdauHXvHgXmnXv+4U1rZhW4hFu9k0mwa/tJQvYFxwUHn/pkoed9VfqqGAZJx L0eReIOZJxqUsv6oJQKPyhQ3+1hyuqyOClODrWUXFyl8GvfLdidWQPCszZ5dqiE8k38k Xfn+/9xO6W7Mmn9XP+92+pEESx6A3hHA7yylm31vJbRiGyAI6tvwuTNV9KhEHJ9nF1ib MXYcVCwskGJHDLAksVLFbsE2rd3Q+B9diikZV5L6g4A2zvBKDo78CzvYM6JiBUJuGwZF 6d4XwDRUuG8lTM/aPxjMOhbH/y5V4ZM6kaUglwZmMSwe5xJf6WL3y7CZa7VYigcl9YP+ z7qg== 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=K+oQDUKLTgoFUQ7Jwsoxniwuuxuix6YxrX9NJG8qB0s=; b=Ah9vR49fU6sqxkJNVHK+5sG8sAUZBB7Jz8gMvnzuvqM+FQbZz3vw7Ug05xTP3WCatn Y0pMmfmA98B/1O31O41Xv/GW4coXlXtHDfJ1NLl0k9KL6D29+t225IerkdKv+fibTEwz rYK0Lf2Fkz9eO7M463ol6lJ8ACr8q/FbhELN80Oz4fv78hc1f/sd3ESa6eVsRpV075xP cPGEpmhmjn6CqMxRF/VjIRSoiqn2A4mleI6TXj+w1Nwwo9KjNrK4cX23lSvsE3uv6l+B M+HJ4NCjE1lIzTUDdyTCAu8EWs7xdg8GQOvm6mLDcRkY00BxJ5gSUvdwVdf3ewUwopFR Dn5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MjXjskCv; 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 uz3si4924653ejb.344.2019.10.27.14.27.16; Sun, 27 Oct 2019 14:27:39 -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=MjXjskCv; 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 S1732802AbfJ0VZs (ORCPT + 99 others); Sun, 27 Oct 2019 17:25:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:47606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732184AbfJ0VZn (ORCPT ); Sun, 27 Oct 2019 17:25:43 -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 2859721850; Sun, 27 Oct 2019 21:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211542; bh=ZG4fvG6/pBhwAx90RYqOxWzvTqywXWxlTO+YY/Ewd98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MjXjskCvp6QpC38mWV9EIN3NScCgyENVqkdzJcmg6Z74m+16I6yzoh+UDZ9pWk0iF NWxG8VBrDsVdphDEd8OJVrPa+Gl43/LwjPJg0h6sAngtsjO+xRmr5zKXPtvh21zth/ oyi+tAjjiKGhN2cshYnYigayjR/Zl5EhymfxEMzY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Ulf Hansson Subject: [PATCH 5.3 189/197] memstick: jmb38x_ms: Fix an error handling path in jmb38x_ms_probe() Date: Sun, 27 Oct 2019 22:01:47 +0100 Message-Id: <20191027203406.691983355@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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 @@ -941,7 +941,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)