Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / fs / pstore / platform.c

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 086e491..423159a 100644 (file)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -651,7 +651,7 @@ static int pstore_write_user_compat(struct pstore_record *record,
                return -EINVAL;
 
        record->buf = memdup_user(buf, record->size);
-       if (unlikely(IS_ERR(record->buf))) {
+       if (IS_ERR(record->buf)) {
                ret = PTR_ERR(record->buf);
                goto out;
        }