ieee1394: merge from Linus

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / vote.c

diff --git a/fs/ocfs2/vote.c b/fs/ocfs2/vote.c
index ee42765a8553e9c5ed51e47805f9bd1440679399..cf70fe2075b8f58e1a4109e7872da1cc7c246c21 100644 (file)
--- a/fs/ocfs2/vote.c
+++ b/fs/ocfs2/vote.c
@@ -988,9 +988,7 @@ int ocfs2_request_mount_vote(struct ocfs2_super *osb)
        }
 
 bail:
-       if (request)
-               kfree(request);
-
+       kfree(request);
        return status;
 }
 
@@ -1021,9 +1019,7 @@ int ocfs2_request_umount_vote(struct ocfs2_super *osb)
        }
 
 bail:
-       if (request)
-               kfree(request);
-
+       kfree(request);
        return status;
 }