diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2019-10-05 13:21:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-29 09:13:31 +0100 |
| commit | 44137b2cfad1a2114467e4c7722c8915e2484529 (patch) | |
| tree | 446b5364c7581bdfd2e2ea1754a172ad3332b673 /drivers/memstick | |
| parent | df514f91210c56ab7a5bc82459e169fed1cce87c (diff) | |
| download | linux-stable-44137b2cfad1a2114467e4c7722c8915e2484529.tar.gz linux-stable-44137b2cfad1a2114467e4c7722c8915e2484529.tar.bz2 linux-stable-44137b2cfad1a2114467e4c7722c8915e2484529.zip | |
memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'
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 <christophe.jaillet@wanadoo.fr>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 48db922075e2..08fa6400d255 100644 --- 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_dev *pdev, if (!cnt) { rc = -ENODEV; pci_dev_busy = 1; - goto err_out; + goto err_out_int; } jm = kzalloc(sizeof(struct jmb38x_ms) |