Skip to content

Commit

Permalink
ieee1394: ohci1394: missing PPC PMac feature calls in failure path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Richter committed Apr 18, 2008
1 parent c4e2e02 commit 9508c20
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/ieee1394/ohci1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9508c20

Please sign in to comment.