PCI: switchtec: Fix an error handling path in switchtec_pci_probe()
[ Upstream commit dec529b0b0572b32f9eb91c882dd1f08ca657efb ] The commit in Fixes changed the logic on how resources are released and introduced a new switchtec_exit_pci() that need to be called explicitly in order to undo a corresponding switchtec_init_pci(). This was done in the remove function, but not in the probe. Fix the probe now. Fixes: df25461119d9 ("PCI: switchtec: Fix stdev_release() crash after surprise hot remove") Link: https://lore.kernel.org/r/01446d2ccb91a578239915812f2b7dfbeb2882af.1703428183.git.christophe.jaillet@wanadoo.fr Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
0bdb56eae2
Коммит
ce6e3c0411
|
@ -1614,7 +1614,7 @@ static int switchtec_pci_probe(struct pci_dev *pdev,
|
|||
rc = switchtec_init_isr(stdev);
|
||||
if (rc) {
|
||||
dev_err(&stdev->dev, "failed to init isr.\n");
|
||||
goto err_put;
|
||||
goto err_exit_pci;
|
||||
}
|
||||
|
||||
iowrite32(SWITCHTEC_EVENT_CLEAR |
|
||||
|
@ -1635,6 +1635,8 @@ static int switchtec_pci_probe(struct pci_dev *pdev,
|
|||
|
||||
err_devadd:
|
||||
stdev_kill(stdev);
|
||||
err_exit_pci:
|
||||
switchtec_exit_pci(stdev);
|
||||
err_put:
|
||||
ida_simple_remove(&switchtec_minor_ida, MINOR(stdev->dev.devt));
|
||||
put_device(&stdev->dev);
|
||||
|
|
Загрузка…
Ссылка в новой задаче