aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-ohci.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-02-24 12:59:55 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 11:55:31 -0400
commitbd7dee6311156b7cdf884344feb34628909398ad (patch)
tree669b5747c607266e495e6f1b1516663bdca1152a /drivers/firewire/fw-ohci.c
parenta6ca4f7081095e3cdeb1a45d66fbe4856eca10d3 (diff)
firewire: remove superfluous reference counting
The card->kref became obsolete since patch "firewire: fix crash in automatic module unloading" added another counter of card users. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jarod Wilson <jwilson@redhat.com>
Diffstat (limited to 'drivers/firewire/fw-ohci.c')
-rw-r--r--drivers/firewire/fw-ohci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index ca6d51efd8b..07d6053ff57 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -2077,7 +2077,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
2077 err = pci_enable_device(dev); 2077 err = pci_enable_device(dev);
2078 if (err) { 2078 if (err) {
2079 fw_error("Failed to enable OHCI hardware.\n"); 2079 fw_error("Failed to enable OHCI hardware.\n");
2080 goto fail_put_card; 2080 goto fail_free;
2081 } 2081 }
2082 2082
2083 pci_set_master(dev); 2083 pci_set_master(dev);
@@ -2173,8 +2173,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
2173 pci_release_region(dev, 0); 2173 pci_release_region(dev, 0);
2174 fail_disable: 2174 fail_disable:
2175 pci_disable_device(dev); 2175 pci_disable_device(dev);
2176 fail_put_card: 2176 fail_free:
2177 fw_card_put(&ohci->card); 2177 kfree(&ohci->card);
2178 2178
2179 return err; 2179 return err;
2180} 2180}
@@ -2202,7 +2202,7 @@ static void pci_remove(struct pci_dev *dev)
2202 pci_iounmap(dev, ohci->registers); 2202 pci_iounmap(dev, ohci->registers);
2203 pci_release_region(dev, 0); 2203 pci_release_region(dev, 0);
2204 pci_disable_device(dev); 2204 pci_disable_device(dev);
2205 fw_card_put(&ohci->card); 2205 kfree(&ohci->card);
2206 2206
2207#ifdef CONFIG_PPC_PMAC 2207#ifdef CONFIG_PPC_PMAC
2208 /* On UniNorth, power down the cable and turn off the chip clock 2208 /* On UniNorth, power down the cable and turn off the chip clock