mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 07:33:19 +02:00
Merge branch 'pci/switchtec'
- Fix error handling path in switchtec_pci_probe() (Christophe JAILLET) * pci/switchtec: PCI: switchtec: Fix an error handling path in switchtec_pci_probe()
This commit is contained in:
commit
598b08b775
|
|
@ -1672,7 +1672,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 |
|
||||
|
|
@ -1693,6 +1693,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_free(&switchtec_minor_ida, MINOR(stdev->dev.devt));
|
||||
put_device(&stdev->dev);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user