diff --git a/[refs] b/[refs]
index c3512cc8c15c..0d5b8b9e78eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43286568adb3ccd4b2f1d0cb7393c355f03e4f39
+refs/heads/master: 130d5496e2c9104dcabdaa5c19cd941770e20edc
diff --git a/trunk/drivers/firewire/fw-ohci.c b/trunk/drivers/firewire/fw-ohci.c
index 533788f227dc..973e762efc24 100644
--- a/trunk/drivers/firewire/fw-ohci.c
+++ b/trunk/drivers/firewire/fw-ohci.c
@@ -2286,8 +2286,6 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 	int err;
 	size_t size;
 
-	ohci_pmac_on(dev);
-
 	ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
 	if (ohci == NULL) {
 		fw_error("Could not malloc fw_ohci data.\n");
@@ -2296,6 +2294,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 
 	fw_card_initialize(&ohci->card, &ohci_driver, &dev->dev);
 
+	ohci_pmac_on(dev);
+
 	err = pci_enable_device(dev);
 	if (err) {
 		fw_error("Failed to enable OHCI hardware.\n");
@@ -2397,6 +2397,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 	pci_disable_device(dev);
  fail_free:
 	kfree(&ohci->card);
+	ohci_pmac_off(dev);
 
 	return err;
 }