diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-29 17:08:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-29 17:08:22 -0700 |
| commit | 36f571e9ed0419e73d127e18aa8992ced867268c (patch) | |
| tree | 94fc210322484b5fa082f28dd2bad702c1685ba9 /include | |
| parent | 8027678202d0e51ac2aa08111ec86b5a77777431 (diff) | |
| parent | 0699a73af3811b66b1ab5650575acee5eea841ab (diff) | |
| download | linux-36f571e9ed0419e73d127e18aa8992ced867268c.tar.bz2 | |
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')
| -rw-r--r-- | include/linux/firewire.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/firewire-cdev.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 3b0e820375ab..5d7782e42b8f 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -436,6 +436,7 @@ struct fw_iso_context { int type; int channel; int speed; + bool drop_overflow_headers; size_t header_size; union { fw_iso_callback_t sc; 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): * |