summaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/hiddev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-11 00:54:41 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-11 00:54:41 +0200
commit7f93220b624de1b7d9fcff8a2cebd6fce7ed4665 (patch)
tree5070ec25635008082b47a646d64b4359896c0faa /drivers/usb/input/hiddev.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff)
parentInput: i8042 - use kzalloc instead of kcalloc (diff)
downloadlinux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.tar.xz
linux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/usb/input/hiddev.c')
-rw-r--r--drivers/usb/input/hiddev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 4c13331b5f41..d32427818af7 100644
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -507,6 +507,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
return -EINVAL;
hid_submit_report(hid, report, USB_DIR_OUT);
+ hid_wait_io(hid);
return 0;