Merge branch 'apei' into release

[~andy/linux] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index d85bd8a7967d2ee26aff8e5313c67a0cd7290532..9d424cebfd2c7d6e31e3cd433342e94f6fc7625c 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -483,6 +483,9 @@ static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,
 
        memcpy(joydev->abspam, abspam, len);
 
+       for (i = 0; i < joydev->nabs; i++)
+               joydev->absmap[joydev->abspam[i]] = i;
+
  out:
        kfree(abspam);
        return retval;
@@ -736,6 +739,7 @@ static const struct file_operations joydev_fops = {
        .compat_ioctl   = joydev_compat_ioctl,
 #endif
        .fasync         = joydev_fasync,
+       .llseek         = no_llseek,
 };
 
 static int joydev_install_chrdev(struct joydev *joydev)