]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 5 Oct 2019 11:21:01 +0000 (13:21 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 9 Oct 2019 09:08:03 +0000 (11:08 +0200)
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>
drivers/memstick/host/jmb38x_ms.c

index 32747425297d840ba4458c6345946b07fec8ba85..64fff6abe60e8394782089931e59e374b68ee5bf 100644 (file)
@@ -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)