summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-03-24 20:53:34 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 17:55:31 +0200
commit9508c208aa6e0a7501d8250d4a9d35344056d573 (patch)
tree60b65236fa656b50c33518c3a8b0b0f4f63726ae /drivers
parentc4e2e02bc96f0a1605f858df3d6d5ea70fc459fc (diff)
downloadlinux-3.10-9508c208aa6e0a7501d8250d4a9d35344056d573.tar.gz
linux-3.10-9508c208aa6e0a7501d8250d4a9d35344056d573.tar.bz2
linux-3.10-9508c208aa6e0a7501d8250d4a9d35344056d573.zip
ieee1394: ohci1394: missing PPC PMac feature calls in failure path
The failure path of ohci1394_pci_probe() reuses ohci1394_pci_remove(). Doing so it missed to call ohci1394_pmac_off() in a few unlikely early error cases. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ieee1394/ohci1394.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 9e304c3cea2..0690469fcec 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3242,7 +3242,7 @@ static void ohci1394_pci_remove(struct pci_dev *dev)
ohci = pci_get_drvdata(dev);
if (!ohci)
- return;
+ goto out;
device = get_device(&ohci->host->device);
@@ -3305,14 +3305,14 @@ static void ohci1394_pci_remove(struct pci_dev *dev)
release_mem_region(pci_resource_start(dev, 0),
OHCI1394_REGISTER_SIZE);
- ohci1394_pmac_off(dev);
-
case OHCI_INIT_ALLOC_HOST:
pci_set_drvdata(dev, NULL);
}
if (device)
put_device(device);
+out:
+ ohci1394_pmac_off(dev);
}
#ifdef CONFIG_PM