memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'

tititiou36 · storulf · commit 28c9fac09ab0 · 2019-10-09T11:08:03.000+02:00
If 'jmb38x_ms_count_slots()' returns 0, we must undo the previous 'pci_request_regions()' call. Goto 'err_out_int' to fix it. Fixes: 60fdd93 ("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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,7 @@ static int jmb38x_ms_probe(struct pci_dev *pdev,`
`941`	`941`	`if (!cnt) {`
`942`	`942`	`rc = -ENODEV;`
`943`	`943`	`pci_dev_busy = 1;`
`944`		`- goto err_out;`
	`944`	`+ goto err_out_int;`
`945`	`945`	`}`
`946`	`946`
`947`	`947`	`jm = kzalloc(sizeof(struct jmb38x_ms)`