summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-30 02:08:22 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-30 02:08:22 +0200
commit36f571e9ed0419e73d127e18aa8992ced867268c (patch)
tree94fc210322484b5fa082f28dd2bad702c1685ba9 /include/uapi
parentMerge tag 'arc-v3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentfirewire: fix libdc1394/FlyCap2 iso event regression (diff)
downloadlinux-36f571e9ed0419e73d127e18aa8992ced867268c.tar.xz
linux-36f571e9ed0419e73d127e18aa8992ced867268c.zip
Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire regression fix from Stefan Richter: "This fixes corrupted video capture, seen with IIDC/DCAM video and certain buffer settings. (Regression since v3.4 inclusive.)" * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: fix libdc1394/FlyCap2 iso event regression
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/firewire-cdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/firewire-cdev.h b/include/uapi/linux/firewire-cdev.h
index d50036953497..1db453e4b550 100644
--- a/include/uapi/linux/firewire-cdev.h
+++ b/include/uapi/linux/firewire-cdev.h
@@ -215,8 +215,8 @@ struct fw_cdev_event_request2 {
* with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with
* %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets
* without the interrupt bit set that the kernel's internal buffer for @header
- * is about to overflow. (In the last case, kernels with ABI version < 5 drop
- * header data up to the next interrupt packet.)
+ * is about to overflow. (In the last case, ABI versions < 5 drop header data
+ * up to the next interrupt packet.)
*
* Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):
*