diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 08:15:43 +0100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 08:15:43 +0100 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /drivers/input/evdev.c | |
| parent | Merge iSeries include file move (diff) | |
| parent | powerpc: include lmb.h in arch/powerpc/platforms/powermac/setup.c (diff) | |
| download | linux-2be7a906752abf8dce9350c23b6d1036049a5d3e.tar.xz linux-2be7a906752abf8dce9350c23b6d1036049a5d3e.zip | |
Merge Paulus' tree
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index a4696cd0978c..9f2352bd8348 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -565,6 +565,7 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon case EV_LED: bits = dev->ledbit; max = LED_MAX; break; case EV_SND: bits = dev->sndbit; max = SND_MAX; break; case EV_FF: bits = dev->ffbit; max = FF_MAX; break; + case EV_SW: bits = dev->swbit; max = SW_MAX; break; default: return -EINVAL; } bit_to_user(bits, max); @@ -579,6 +580,9 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon if (_IOC_NR(cmd) == _IOC_NR(EVIOCGSND(0))) bit_to_user(dev->snd, SND_MAX); + if (_IOC_NR(cmd) == _IOC_NR(EVIOCGSW(0))) + bit_to_user(dev->sw, SW_MAX); + if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0))) { int len; if (!dev->name) return -ENOENT; |