aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 5437ad245a37..68428d013d8d 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 c6ea6f32a94b..0cc4b082257f 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 {