diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
| commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
| tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /drivers/firewire/fw-device.c | |
| parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
| download | op-kernel-dev-a208f37a465e222218974ab20a31b42b7b4893b2.zip op-kernel-dev-a208f37a465e222218974ab20a31b42b7b4893b2.tar.gz | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'drivers/firewire/fw-device.c')
| -rw-r--r-- | drivers/firewire/fw-device.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index d9c8daf..0855fb5 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c @@ -168,7 +168,7 @@ static void fw_device_release(struct device *dev) fw_node_put(device->node); kfree(device->config_rom); kfree(device); - atomic_dec(&card->device_count); + fw_card_put(card); } int fw_device_enable_phys_dma(struct fw_device *device) @@ -946,8 +946,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) */ device_initialize(&device->device); atomic_set(&device->state, FW_DEVICE_INITIALIZING); - atomic_inc(&card->device_count); - device->card = card; + device->card = fw_card_get(card); device->node = fw_node_get(node); device->node_id = node->node_id; device->generation = card->generation; |
