Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/char/qtronix.c b/drivers/char/qtronix.c
index 40a3cf62e1a8..601d09baf9d7 100644
--- a/drivers/char/qtronix.c
+++ b/drivers/char/qtronix.c
@@ -591,6 +591,11 @@ static int __init psaux_init(void)
                 return retval;
 
         queue = (struct aux_queue *) kmalloc(sizeof(*queue), GFP_KERNEL);
+        if (!queue) {
+                misc_deregister(&psaux_mouse);
+                return -ENOMEM;
+        }
+                
         memset(queue, 0, sizeof(*queue));
         queue->head = queue->tail = 0;
         init_waitqueue_head(&queue->proc_list);