diff --git a/[refs] b/[refs]
index 67a5be8b2ac6..4f101625a09f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4e2e02bc96f0a1605f858df3d6d5ea70fc459fc
+refs/heads/master: 9508c208aa6e0a7501d8250d4a9d35344056d573
diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c
index 9e304c3cea22..0690469fcecf 100644
--- a/trunk/drivers/ieee1394/ohci1394.c
+++ b/trunk/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