aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-03-07 12:12:52 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 16:03:13 -0500
commite7533505fed97379b03538cf0ff2df0dc853298f (patch)
tree6e13393cf45cb2590de39a5ced38425e6e3defe9
parent8fbdbb3683770f765afb4f8140a8d7898feeb94c (diff)
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>
-rw-r--r--drivers/firewire/fw-device-cdev.c2
-rw-r--r--drivers/firewire/fw-device-cdev.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
index 5437ad245a3..68428d013d8 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)
290 return -EFAULT; 290 return -EFAULT;
291 } 291 }
292 292
293 get_info.card = client->device->card->index;
294
293 if (copy_to_user(arg, &get_info, sizeof get_info)) 295 if (copy_to_user(arg, &get_info, sizeof get_info))
294 return -EFAULT; 296 return -EFAULT;
295 297
diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h
index c6ea6f32a94..0cc4b082257 100644
--- a/drivers/firewire/fw-device-cdev.h
+++ b/drivers/firewire/fw-device-cdev.h
@@ -140,6 +140,9 @@ struct fw_cdev_get_info {
140 /* If non-zero, a fw_cdev_event_bus_reset struct will be 140 /* If non-zero, a fw_cdev_event_bus_reset struct will be
141 * copied here with the current state of the bus. */ 141 * copied here with the current state of the bus. */
142 __u64 bus_reset; 142 __u64 bus_reset;
143
144 /* The index of the card this devices belongs to. */
145 __u32 card;
143}; 146};
144 147
145struct fw_cdev_send_request { 148struct fw_cdev_send_request {