diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 12:56:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 12:56:23 -0800 |
| commit | b39bda6e7329b1be6dfc2741ed298b6e814532a5 (patch) | |
| tree | c1d8f0bad47b45e47cc8aaa814aaba502ec28ea9 /include | |
| parent | be8cde8b24c9dca1e54598690115eee5b1476519 (diff) | |
| parent | 7a481436787cbc932af6c407b317ac603969a242 (diff) | |
| download | linux-3.10-b39bda6e7329b1be6dfc2741ed298b6e814532a5.tar.gz linux-3.10-b39bda6e7329b1be6dfc2741ed298b6e814532a5.tar.bz2 linux-3.10-b39bda6e7329b1be6dfc2741ed298b6e814532a5.zip | |
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: ohci: fix crashes with TSB43AB23 on 64bit systems
firewire: core: fix use-after-free regression in FCP handler
firewire: cdev: add_descriptor documentation fix
firewire: core: add_descriptor size check
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firewire-cdev.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h index 1f716d9f714..520ecf86cbb 100644 --- a/include/linux/firewire-cdev.h +++ b/include/linux/firewire-cdev.h @@ -380,7 +380,7 @@ struct fw_cdev_initiate_bus_reset { * @immediate: If non-zero, immediate key to insert before pointer * @key: Upper 8 bits of root directory pointer * @data: Userspace pointer to contents of descriptor block - * @length: Length of descriptor block data, in bytes + * @length: Length of descriptor block data, in quadlets * @handle: Handle to the descriptor, written by the kernel * * Add a descriptor block and optionally a preceding immediate key to the local @@ -394,6 +394,8 @@ struct fw_cdev_initiate_bus_reset { * If not 0, the @immediate field specifies an immediate key which will be * inserted before the root directory pointer. * + * @immediate, @key, and @data array elements are CPU-endian quadlets. + * * If successful, the kernel adds the descriptor and writes back a handle to the * kernel-side object to be used for later removal of the descriptor block and * immediate key. |