From 786fb7ef76343f01bdaa637403be3c097b483608 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 24 Mar 2008 20:55:28 +0100 Subject: [PATCH] --- yaml --- r: 89633 b: refs/heads/master c: 130d5496e2c9104dcabdaa5c19cd941770e20edc h: refs/heads/master i: 89631: e5201c07cbb32e3a3d828c57cd1574486e0d6817 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-ohci.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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; }