summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2019-10-05 13:21:01 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2019-10-09 11:08:03 +0200
commit28c9fac09ab0147158db0baeec630407a5e9b892 (patch)
treeff7c75a59df16d882fa87db3f06c2e02c73305d3 /drivers/memstick
parentmmc: sdhci-iproc: fix spurious interrupts on Multiblock reads with bcm2711 (diff)
downloadlinux-28c9fac09ab0147158db0baeec630407a5e9b892.tar.xz
linux-28c9fac09ab0147158db0baeec630407a5e9b892.zip
memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'
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 <christophe.jaillet@wanadoo.fr> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/host/jmb38x_ms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 32747425297d..64fff6abe60e 100644
--- 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_dev *pdev,
if (!cnt) {
rc = -ENODEV;
pci_dev_busy = 1;
- goto err_out;
+ goto err_out_int;
}
jm = kzalloc(sizeof(struct jmb38x_ms)