Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14533
b: refs/heads/master
c: 59c7c03
h: refs/heads/master
i:
  14531: f464ab9
v: v3
  • Loading branch information
Dmitry Torokhov committed Nov 20, 2005
1 parent 2f8a106 commit ba66ea7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 29506415a0ff0152cc2928f8fcac724fbbf98651
refs/heads/master: 59c7c0377e00a3cbd7b71631177fb92166ceb437
4 changes: 4 additions & 0 deletions trunk/drivers/input/misc/uinput.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,10 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
retval = uinput_set_bit(arg, ffbit, FF_MAX);
break;

case UI_SET_SWBIT:
retval = uinput_set_bit(arg, swbit, SW_MAX);
break;

case UI_SET_PHYS:
if (udev->state == UIST_CREATED) {
retval = -EINVAL;
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/uinput.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ struct uinput_ff_erase {
#define UI_SET_SNDBIT _IOW(UINPUT_IOCTL_BASE, 106, int)
#define UI_SET_FFBIT _IOW(UINPUT_IOCTL_BASE, 107, int)
#define UI_SET_PHYS _IOW(UINPUT_IOCTL_BASE, 108, char*)
#define UI_SET_SWBIT _IOW(UINPUT_IOCTL_BASE, 109, int)

#define UI_BEGIN_FF_UPLOAD _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload)
#define UI_END_FF_UPLOAD _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload)
Expand Down

0 comments on commit ba66ea7

Please sign in to comment.