From: =?utf-8?q?Kristian_H=C3=B8gsberg?= Subject: [PATCH 17/21] firewire: Add card index field to get_info cdev ioctl struct. Date: Wed, 7 Mar 2007 12:12:52 -0500 Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter --- drivers/firewire/fw-device-cdev.c | 2 ++ drivers/firewire/fw-device-cdev.h | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c index 5437ad2..68428d0 100644 --- a/drivers/firewire/fw-device-cdev.c +++ b/drivers/firewire/fw-device-cdev.c @@ -290,6 +290,8 @@ static int ioctl_get_info(struct client *client, void __user *arg) return -EFAULT; } + get_info.card = client->device->card->index; + if (copy_to_user(arg, &get_info, sizeof get_info)) return -EFAULT; diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h index c6ea6f3..0cc4b08 100644 --- a/drivers/firewire/fw-device-cdev.h +++ b/drivers/firewire/fw-device-cdev.h @@ -140,6 +140,9 @@ struct fw_cdev_get_info { /* If non-zero, a fw_cdev_event_bus_reset struct will be * copied here with the current state of the bus. */ __u64 bus_reset; + + /* The index of the card this devices belongs to. */ + __u32 card; }; struct fw_cdev_send_request {