diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:43:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:43:22 -0700 |
| commit | ff830b8e5f999d1ccbd0282a666520f0b557daa4 (patch) | |
| tree | 5979aba5ed48c93d658a208f3a1f714e9e1e8b67 /drivers/firewire/core.h | |
| parent | 746942d06acdb4dd78d16baa5f3728a48a033bdd (diff) | |
| parent | 625f0850a8e27b6a8d6fdb95056f35bc22d92b55 (diff) | |
| download | op-kernel-dev-ff830b8e5f999d1ccbd0282a666520f0b557daa4.zip op-kernel-dev-ff830b8e5f999d1ccbd0282a666520f0b557daa4.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: sbp2: remove a workaround for Momobay FX-3A
firewire: sbp2: remove a workaround for Momobay FX-3A
firewire: sbp2: fix status reception
firewire: core: fix topology map response handler
firewire: core: fix race with parallel PCI device probe
firewire: core: header file cleanup
firewire: ohci: fix Self ID Count register mask (safeguard against buffer overflow)
ieee1394: raw1394: Do not leak memory on failed trylock.
Diffstat (limited to 'drivers/firewire/core.h')
| -rw-r--r-- | drivers/firewire/core.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index 6052816..7ff6e75 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h @@ -96,6 +96,20 @@ int fw_core_initiate_bus_reset(struct fw_card *card, int short_reset); int fw_compute_block_crc(u32 *block); void fw_schedule_bm_work(struct fw_card *card, unsigned long delay); +static inline struct fw_card *fw_card_get(struct fw_card *card) +{ + kref_get(&card->kref); + + return card; +} + +void fw_card_release(struct kref *kref); + +static inline void fw_card_put(struct fw_card *card) +{ + kref_put(&card->kref, fw_card_release); +} + /* -cdev */ |
