diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/usb/mon/mon_bin.c | |
parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/usb/mon/mon_bin.c')
-rw-r--r-- | drivers/usb/mon/mon_bin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index a09dbd243eb3..91cd85076a44 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
13 | #include <linux/cdev.h> | 13 | #include <linux/cdev.h> |
14 | #include <linux/export.h> | ||
14 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
15 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
16 | #include <linux/compat.h> | 17 | #include <linux/compat.h> |
@@ -1101,7 +1102,7 @@ static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg | |||
1101 | nevents = mon_bin_queued(rp); | 1102 | nevents = mon_bin_queued(rp); |
1102 | 1103 | ||
1103 | sp = (struct mon_bin_stats __user *)arg; | 1104 | sp = (struct mon_bin_stats __user *)arg; |
1104 | if (put_user(rp->cnt_lost, &sp->dropped)) | 1105 | if (put_user(ndropped, &sp->dropped)) |
1105 | return -EFAULT; | 1106 | return -EFAULT; |
1106 | if (put_user(nevents, &sp->queued)) | 1107 | if (put_user(nevents, &sp->queued)) |
1107 | return -EFAULT; | 1108 | return -EFAULT; |