Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/net/socket.c b/net/socket.c
index 06fa217f58a9..b38a263853c3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -993,7 +993,7 @@ static int sock_fasync(int fd, struct file *filp, int on)
 
         if (on)
         {
-                fna=(struct fasync_struct *)kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
+                fna = kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
                 if(fna==NULL)
                         return -ENOMEM;
         }