From: Kristian Høgsberg <krh@redhat.com>
Date: Wed, 7 Mar 2007 17:12:52 +0000 (-0500)
Subject: firewire: Add card index field to get_info cdev ioctl struct.
X-Git-Tag: v2.6.22-rc1~111^2~56
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7533505fed97379b03538cf0ff2df0dc853298f;p=linux-2.6

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 5437ad245a..68428d013d 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 c6ea6f32a9..0cc4b08225 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 {