summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jay Fenlason 2009-11-19 15:00:02 -0500
committerGravatar Stefan Richter 2009-11-22 23:34:47 +0100
commit72e5368aedd7eb964c1dcc14f11fa3188e9368c6 (patch)
treefc6b413db1974ee1a2da794dc8346d087e763a5a
parentCalculate iso receive cycles on firewire-core at ABI version 1 (diff)
Initialize unused fields in ioctl arguments
This change is essentially cosmetic: Set fields of structs passed to the kernel via ioctl so that valgrind will not complain about them. Signed-off-by: Jay Fenlason <fenlason@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (changelog, comments)
-rw-r--r--src/fw-iso.c2
-rw-r--r--src/fw.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/fw-iso.c b/src/fw-iso.c
index 466b638..677b98d 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
@@ -140,6 +140,8 @@ int fw_iso_xmit_start(raw1394handle_t handle, int start_on_cycle,
return -1;
if (fwhandle->iso.prebuffer <= fwhandle->iso.packet_count) {
+ start_iso.sync = 0; /* unused */
+ start_iso.tags = 0; /* unused */
start_iso.cycle = start_on_cycle;
start_iso.handle = 0;
diff --git a/src/fw.c b/src/fw.c
index d63d0da..7277253 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -1406,6 +1406,7 @@ iso_resource_modify(raw1394handle_t handle, unsigned int bandwidth,
resource.closure = ptr_to_u64(&event);
resource.channels = channel >= 0 ? 1ULL << channel : 0;
resource.bandwidth = bandwidth;
+ resource.handle = 0; /* unused */
ioctl_nr = mode == RAW1394_MODIFY_ALLOC ?
FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE :