summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
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