firewire: Add card index field to get_info cdev ioctl struct.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
index 5437ad245a37655e219fac413ae84b1809be693e..68428d013d8d99d068ff16d4f94486e637f22538 100644 (file)
--- 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 c6ea6f32a94beea541ee9cd098be3a36783018e4..0cc4b082257f9994f0ba58bf48fefdbfe7c03852 100644 (file)
--- 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 {