Messages in this thread Patch in this message | | | Date | Mon, 24 Mar 2008 20:55:28 +0100 (CET) | From | Stefan Richter <> | Subject | [PATCH] firewire: fw-ohci: missing PPC PMac feature calls in failure path |
| |
Balance ohci_pmac_on and ohci_pmac_off if pci_driver.probe fails.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> --- drivers/firewire/fw-ohci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux/drivers/firewire/fw-ohci.c =================================================================== --- linux.orig/drivers/firewire/fw-ohci.c +++ linux/drivers/firewire/fw-ohci.c @@ -2285,8 +2285,6 @@ pci_probe(struct pci_dev *dev, const str int err; size_t size; - ohci_pmac_on(dev); - ohci = kzalloc(sizeof(*ohci), GFP_KERNEL); if (ohci == NULL) { fw_error("Could not malloc fw_ohci data.\n"); @@ -2295,6 +2293,8 @@ pci_probe(struct pci_dev *dev, const str fw_card_initialize(&ohci->card, &ohci_driver, &dev->dev); + ohci_pmac_on(dev); + err = pci_enable_device(dev); if (err) { fw_error("Failed to enable OHCI hardware.\n"); @@ -2396,6 +2396,7 @@ pci_probe(struct pci_dev *dev, const str pci_disable_device(dev); fail_free: kfree(&ohci->card); + ohci_pmac_off(dev); return err; } -- Stefan Richter -=====-==--- --== ==--- http://arcgraph.de/sr/
| |