diff --git a/[refs] b/[refs] index 5d0b761900a3..3718153ca918 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ff77c469ed16221c6a4e882e48e4f0dcf451bda +refs/heads/master: 96ed748d9da03d091799f8107fce27d218fd8f5c diff --git a/trunk/drivers/char/qtronix.c b/trunk/drivers/char/qtronix.c index 40a3cf62e1a8..601d09baf9d7 100644 --- a/trunk/drivers/char/qtronix.c +++ b/trunk/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);