diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /drivers/s390/char/vmcp.c | |
parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/s390/char/vmcp.c')
-rw-r--r-- | drivers/s390/char/vmcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 8990d8076e7d..19762f3476aa 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c | |||
@@ -103,8 +103,10 @@ vmcp_write(struct file *file, const char __user * buff, size_t count, | |||
103 | } | 103 | } |
104 | cmd[count] = '\0'; | 104 | cmd[count] = '\0'; |
105 | session = (struct vmcp_session *)file->private_data; | 105 | session = (struct vmcp_session *)file->private_data; |
106 | if (down_interruptible(&session->mutex)) | 106 | if (down_interruptible(&session->mutex)) { |
107 | kfree(cmd); | ||
107 | return -ERESTARTSYS; | 108 | return -ERESTARTSYS; |
109 | } | ||
108 | if (!session->response) | 110 | if (!session->response) |
109 | session->response = (char *)__get_free_pages(GFP_KERNEL | 111 | session->response = (char *)__get_free_pages(GFP_KERNEL |
110 | | __GFP_REPEAT | GFP_DMA, | 112 | | __GFP_REPEAT | GFP_DMA, |