diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-03-24 15:53:34 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-04-18 11:55:31 -0400 |
commit | 9508c208aa6e0a7501d8250d4a9d35344056d573 (patch) | |
tree | 60b65236fa656b50c33518c3a8b0b0f4f63726ae | |
parent | c4e2e02bc96f0a1605f858df3d6d5ea70fc459fc (diff) |
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>
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 9e304c3cea22..0690469fcecf 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -3242,7 +3242,7 @@ static void ohci1394_pci_remove(struct pci_dev *dev) | |||
3242 | 3242 | ||
3243 | ohci = pci_get_drvdata(dev); | 3243 | ohci = pci_get_drvdata(dev); |
3244 | if (!ohci) | 3244 | if (!ohci) |
3245 | return; | 3245 | goto out; |
3246 | 3246 | ||
3247 | device = get_device(&ohci->host->device); | 3247 | device = get_device(&ohci->host->device); |
3248 | 3248 | ||
@@ -3305,14 +3305,14 @@ static void ohci1394_pci_remove(struct pci_dev *dev) | |||
3305 | release_mem_region(pci_resource_start(dev, 0), | 3305 | release_mem_region(pci_resource_start(dev, 0), |
3306 | OHCI1394_REGISTER_SIZE); | 3306 | OHCI1394_REGISTER_SIZE); |
3307 | 3307 | ||
3308 | ohci1394_pmac_off(dev); | ||
3309 | |||
3310 | case OHCI_INIT_ALLOC_HOST: | 3308 | case OHCI_INIT_ALLOC_HOST: |
3311 | pci_set_drvdata(dev, NULL); | 3309 | pci_set_drvdata(dev, NULL); |
3312 | } | 3310 | } |
3313 | 3311 | ||
3314 | if (device) | 3312 | if (device) |
3315 | put_device(device); | 3313 | put_device(device); |
3314 | out: | ||
3315 | ohci1394_pmac_off(dev); | ||
3316 | } | 3316 | } |
3317 | 3317 | ||
3318 | #ifdef CONFIG_PM | 3318 | #ifdef CONFIG_PM |