drm/amdgpu: Fix a deadlock if previous GEM object allocation fails

[linux-2.6-microblaze.git] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index da8963a..947d440 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -499,7 +499,7 @@ static int joydev_handle_JSIOCSBTNMAP(struct joydev *joydev,
        memcpy(joydev->keypam, keypam, len);
 
        for (i = 0; i < joydev->nkey; i++)
-               joydev->keymap[keypam[i] - BTN_MISC] = i;
+               joydev->keymap[joydev->keypam[i] - BTN_MISC] = i;
 
  out:
        kfree(keypam);