forked from Minki/linux
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>
This commit is contained in:
parent
c4e2e02bc9
commit
9508c208aa
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user