diff --git a/[refs] b/[refs] index 4460e7389d53..7f2511797b66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e53cfda5d2c90a6dd763eb72034c775add729e40 +refs/heads/master: 0e2bcaae836e535236244bfc900626ee541eb7bb diff --git a/trunk/net/socket.c b/trunk/net/socket.c index 88f759adf3af..9663df63e3d1 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -1173,15 +1173,6 @@ static int sock_mmap(struct file *file, struct vm_area_struct *vma) static int sock_close(struct inode *inode, struct file *filp) { - /* - * It was possible the inode is NULL we were - * closing an unfinished socket. - */ - - if (!inode) { - printk(KERN_DEBUG "sock_close: NULL inode\n"); - return 0; - } sock_release(SOCKET_I(inode)); return 0; }