From a75656cf34b3030bd22568e8aeb73dc68ed6b31c Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 10 Apr 2010 12:23:09 +0200 Subject: [PATCH] --- yaml --- r: 189935 b: refs/heads/master c: ca658b1e29d6be939207532e337fb640eb697f71 h: refs/heads/master i: 189933: 1ddc8d26fceff99131f0533b5497c29e19589146 189931: 3c5e27a09e252a526340fbb55a5e35b3c73b5069 189927: 56f0f6afe24b137120a60ae4e6d1edd4e6e50a11 189919: c94e85534cc3045883cf75d01d0a7479a74a9ce3 v: v3 --- [refs] | 2 +- trunk/include/linux/firewire-cdev.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8966010139ed..e43b6fbe4be1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa6fec3cdeb14ecc916eb78c4cd9ed79e4f7fe8d +refs/heads/master: ca658b1e29d6be939207532e337fb640eb697f71 diff --git a/trunk/include/linux/firewire-cdev.h b/trunk/include/linux/firewire-cdev.h index 011fdf1eaec5..6ffb24a1f2f2 100644 --- a/trunk/include/linux/firewire-cdev.h +++ b/trunk/include/linux/firewire-cdev.h @@ -647,8 +647,8 @@ struct fw_cdev_get_cycle_timer2 { * instead of allocated. * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation. * - * To summarize, %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE allocates iso resources - * for the lifetime of the fd or handle. + * To summarize, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE allocates iso resources + * for the lifetime of the fd or @handle. * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources * for the duration of a bus generation. *