diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 16:32:39 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 16:32:39 (GMT) |
commit | 148b729b9f51a78c1a024369bdcdc592f01103d4 (patch) | |
tree | 0fa25d5dcff62b67545deebbebed11967753ce94 /include/linux | |
parent | 9ec97169e7d6afe2f8206d694d1411fb3bb49853 (diff) | |
parent | e3cbd92002a30aecae8cb8b31a5e1916eb270a14 (diff) | |
download | linux-fsl-qoriq-148b729b9f51a78c1a024369bdcdc592f01103d4.tar.xz |
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire updates from Stefan Richter:
- Small fixes and optimizations.
- A new sysfs attribute to tell local and remote nodes apart.
Useful to set special permissions/ ownership of local nodes'
/dev/fw*, to start daemons on them (for diagnostics, management,
AV targets, VersaPHY initiator or targets...), to pick up their
GUID to use it as GUID of an SBP2 target instance, and of course
for informational purposes.
* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: core: document is_local sysfs attribute
firewire: core: add is_local sysfs device attribute
firewire: ohci: initialize multiChanMode bits after reset
firewire: core: fix multichannel IR with buffers larger than 2 GB
firewire: ohci: sanity-check MMIO resource
firewire: ohci: lazy bus time initialization
firewire: core: allocate the low memory region
firewire: core: make address handler length 64 bits
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/firewire.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 7edcf10..db04ec5 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -152,7 +152,7 @@ static inline void fw_card_put(struct fw_card *card) struct fw_attribute_group { struct attribute_group *groups[2]; struct attribute_group group; - struct attribute *attrs[12]; + struct attribute *attrs[13]; }; enum fw_device_state { @@ -321,7 +321,7 @@ struct fw_transaction { struct fw_address_handler { u64 offset; - size_t length; + u64 length; fw_address_callback_t address_callback; void *callback_data; struct list_head link; |