diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 09:37:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 09:37:16 -0700 |
| commit | 1d63e726408dfdb3e10ed8f00c383b30ebb333d3 (patch) | |
| tree | abd2154d0515bf5581cdd2d2a6224960829145d2 /drivers/firewire/fw-transaction.h | |
| parent | 31390d0fde1ac9cf47002729660ffd7cd2ae1d75 (diff) | |
| parent | cd1f70fdb4823c97328a1f151f328eb36fafd579 (diff) | |
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:
firewire: fw-sbp2: fix races
firewire: fw-sbp2: delay first login to avoid retries
firewire: fw-ohci: initialization failure path fixes
firewire: fw-ohci: don't leak dma memory on module removal
firewire: fix struct fw_node memory leak
firewire: Survive more than 256 bus resets
Diffstat (limited to 'drivers/firewire/fw-transaction.h')
| -rw-r--r-- | drivers/firewire/fw-transaction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index 027f58ce81a..aed7dbb17cd 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h @@ -248,7 +248,7 @@ struct fw_card { struct fw_node *local_node; struct fw_node *root_node; struct fw_node *irm_node; - int color; + u8 color; /* must be u8 to match the definition in struct fw_node */ int gap_count; bool beta_repeaters_present; |