From f6abfde155fd9ae3d8be52e1054c5e3e8b5e4db7 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Wed, 7 Jul 2010 14:13:14 +0200 Subject: [PATCH] --- yaml --- r: 206839 b: refs/heads/master c: eb5b35a560510efc6bb62f05c3c82e9596cdfafe h: refs/heads/master i: 206837: 172e6a57e967c46fdb2800d745bf34c3780ce333 206835: bda9ca9128b07457ca7364ebe9a51fbb00261a35 206831: 43bbef6e9785275be8bc49ed4952d3e0a1a9894f v: v3 --- [refs] | 2 +- trunk/drivers/firewire/core-cdev.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d1d56da750b1..e6a9204c0c82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 656b7afd40a9f2b0d6cf8ef1972681961b428558 +refs/heads/master: eb5b35a560510efc6bb62f05c3c82e9596cdfafe diff --git a/trunk/drivers/firewire/core-cdev.c b/trunk/drivers/firewire/core-cdev.c index f7559bfeaba3..7a690c466ce9 100644 --- a/trunk/drivers/firewire/core-cdev.c +++ b/trunk/drivers/firewire/core-cdev.c @@ -18,6 +18,7 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -909,6 +910,9 @@ static int ioctl_create_iso_context(struct client *client, union ioctl_arg *arg) struct fw_cdev_create_iso_context *a = &arg->create_iso_context; struct fw_iso_context *context; + BUILD_BUG_ON(FW_CDEV_ISO_CONTEXT_TRANSMIT != FW_ISO_CONTEXT_TRANSMIT || + FW_CDEV_ISO_CONTEXT_RECEIVE != FW_ISO_CONTEXT_RECEIVE); + if (a->channel > 63) return -EINVAL; @@ -1060,6 +1064,13 @@ static int ioctl_start_iso(struct client *client, union ioctl_arg *arg) { struct fw_cdev_start_iso *a = &arg->start_iso; + BUILD_BUG_ON( + FW_CDEV_ISO_CONTEXT_MATCH_TAG0 != FW_ISO_CONTEXT_MATCH_TAG0 || + FW_CDEV_ISO_CONTEXT_MATCH_TAG1 != FW_ISO_CONTEXT_MATCH_TAG1 || + FW_CDEV_ISO_CONTEXT_MATCH_TAG2 != FW_ISO_CONTEXT_MATCH_TAG2 || + FW_CDEV_ISO_CONTEXT_MATCH_TAG3 != FW_ISO_CONTEXT_MATCH_TAG3 || + FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS != FW_ISO_CONTEXT_MATCH_ALL_TAGS); + if (client->iso_context == NULL || a->handle != 0) return -EINVAL;