projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
input
/
evdev.c
diff --git
a/drivers/input/evdev.c
b/drivers/input/evdev.c
index
6cff809
..
b234729
100644
(file)
--- a/
drivers/input/evdev.c
+++ b/
drivers/input/evdev.c
@@
-18,7
+18,6
@@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/major.h>
#include <linux/init.h>
#include <linux/input.h>
#include <linux/major.h>
-#include <linux/smp_lock.h>
#include <linux/device.h>
#include <linux/compat.h>
#include <linux/device.h>
#include <linux/compat.h>
@@
-337,7
+336,7
@@
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
if (compat) {
len = NBITS_COMPAT(maxbit) * sizeof(compat_long_t);
if (compat) {
len = NBITS_COMPAT(maxbit) * sizeof(compat_long_t);
- if (len
<
maxlen)
+ if (len
>
maxlen)
len = maxlen;
for (i = 0; i < len / sizeof(compat_long_t); i++)
len = maxlen;
for (i = 0; i < len / sizeof(compat_long_t); i++)
@@
-512,7
+511,7
@@
static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) {
if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) {
- long *bits;
+
unsigned
long *bits;
int len;
switch (_IOC_NR(cmd) & EV_MAX) {
int len;
switch (_IOC_NR(cmd) & EV_MAX) {
@@
-557,7
+556,7
@@
static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) {
if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) {
-
int
t = _IOC_NR(cmd) & ABS_MAX;
+ t = _IOC_NR(cmd) & ABS_MAX;
abs.value = dev->abs[t];
abs.minimum = dev->absmin[t];
abs.value = dev->abs[t];
abs.minimum = dev->absmin[t];
@@
-577,7
+576,7
@@
static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {
if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {
-
int
t = _IOC_NR(cmd) & ABS_MAX;
+ t = _IOC_NR(cmd) & ABS_MAX;
if (copy_from_user(&abs, p, sizeof(struct input_absinfo)))
return -EFAULT;
if (copy_from_user(&abs, p, sizeof(struct input_absinfo)))
return -EFAULT;
@@
-664,7
+663,7
@@
static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
}
/* temporary symlink to keep userspace happy */
}
/* temporary symlink to keep userspace happy */
- error = sysfs_create_link(&input_class.subsys.k
set.k
obj,
+ error = sysfs_create_link(&input_class.subsys.kobj,
&cdev->kobj, evdev->name);
if (error)
goto err_cdev_destroy;
&cdev->kobj, evdev->name);
if (error)
goto err_cdev_destroy;
@@
-676,7
+675,7
@@
static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
return 0;
err_remove_link:
return 0;
err_remove_link:
- sysfs_remove_link(&input_class.subsys.k
set.k
obj, evdev->name);
+ sysfs_remove_link(&input_class.subsys.kobj, evdev->name);
err_cdev_destroy:
class_device_destroy(&input_class, devt);
err_free_evdev:
err_cdev_destroy:
class_device_destroy(&input_class, devt);
err_free_evdev:
@@
-692,7
+691,7
@@
static void evdev_disconnect(struct input_handle *handle)
input_unregister_handle(handle);
input_unregister_handle(handle);
- sysfs_remove_link(&input_class.subsys.k
set.k
obj, evdev->name);
+ sysfs_remove_link(&input_class.subsys.kobj, evdev->name);
class_device_destroy(&input_class,
MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
evdev->exist = 0;
class_device_destroy(&input_class,
MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
evdev->exist = 0;