diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 09:25:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 09:25:31 -0700 |
| commit | 71c4c8b7c3bdeccef4f478c643a9ff382ec07241 (patch) | |
| tree | 0653596f04e14976e717398543a958b4567bb8a9 /drivers/input/evdev.c | |
| parent | 3730793d457fed79a6d49bae72996d458c8e4f2d (diff) | |
| parent | 032e46cbf5fb1d768d7dec5631c224e22b4be46f (diff) | |
| download | talos-op-linux-71c4c8b7c3bdeccef4f478c643a9ff382ec07241.tar.gz talos-op-linux-71c4c8b7c3bdeccef4f478c643a9ff382ec07241.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: atkbd - add force relese key quirk for Soltech TA12
Input: fix EVIOCGNAME/JSIOCGNAME regression
Input: atkbd - add forced release keys quirk for FSC Amilo Pi 3525
Input: pcspkr - switch driver to dev_pm_ops
Input: xpad - don't resend successfully sent outgoing requests
Input: wistron_btns - recognize Maxdata Pro 7000 notebooks
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 114efd8dc8f5..1148140d08a1 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -608,8 +608,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, p, compat_mode); if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0))) - return str_to_user(dev_name(&evdev->dev), - _IOC_SIZE(cmd), p); + return str_to_user(dev->name, _IOC_SIZE(cmd), p); if (_IOC_NR(cmd) == _IOC_NR(EVIOCGPHYS(0))) return str_to_user(dev->phys, _IOC_SIZE(cmd), p); |
