Merge remote-tracking branch 'ubifs/linux-next'

[karo-tx-linux.git] / fs / pstore / pmsg.c

diff --git a/fs/pstore/pmsg.c b/fs/pstore/pmsg.c
index feb5dd2948b4e4ef7a5857e51389194617f49d76..7de20cd3797f1d3929f4abe2f9741c756259c7bd 100644 (file)
--- a/fs/pstore/pmsg.c
+++ b/fs/pstore/pmsg.c
@@ -37,6 +37,8 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,
        if (buffer_size > PMSG_MAX_BOUNCE_BUFFER_SIZE)
                buffer_size = PMSG_MAX_BOUNCE_BUFFER_SIZE;
        buffer = vmalloc(buffer_size);
+       if (!buffer)
+               return -ENOMEM;
 
        mutex_lock(&pmsg_lock);
        for (i = 0; i < count; ) {
@@ -112,3 +114,10 @@ err_class:
 err:
        return;
 }
+
+void pstore_unregister_pmsg(void)
+{
+       device_destroy(pmsg_class, MKDEV(pmsg_major, 0));
+       class_destroy(pmsg_class);
+       unregister_chrdev(pmsg_major, PMSG_NAME);
+}