summaryrefslogtreecommitdiff
path: root/drivers/input/misc/powermate.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-10-25 05:11:17 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-10-25 05:11:17 (GMT)
commit49327ad2bbbaf1945d5ba431522201574219d150 (patch)
tree47beb374d0cfb77d401220f20e8cece4ce4469db /drivers/input/misc/powermate.c
parentf9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff)
parent6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff)
downloadlinux-49327ad2bbbaf1945d5ba431522201574219d150.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/misc/powermate.c')
-rw-r--r--drivers/input/misc/powermate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index bf170f6..f459471 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -280,7 +280,7 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev
pm->configcr = kmalloc(sizeof(*(pm->configcr)), GFP_KERNEL);
if (!pm->configcr)
- return -1;
+ return -ENOMEM;
return 0;
}