diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /drivers/usb/gadget/inode.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/usb/gadget/inode.c')
| -rw-r--r-- | drivers/usb/gadget/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index eeb26c0f88e5..317b48fdbf01 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
| @@ -2001,7 +2001,6 @@ gadgetfs_make_inode (struct super_block *sb, | |||
| 2001 | inode->i_mode = mode; | 2001 | inode->i_mode = mode; |
| 2002 | inode->i_uid = default_uid; | 2002 | inode->i_uid = default_uid; |
| 2003 | inode->i_gid = default_gid; | 2003 | inode->i_gid = default_gid; |
| 2004 | inode->i_blocks = 0; | ||
| 2005 | inode->i_atime = inode->i_mtime = inode->i_ctime | 2004 | inode->i_atime = inode->i_mtime = inode->i_ctime |
| 2006 | = CURRENT_TIME; | 2005 | = CURRENT_TIME; |
| 2007 | inode->i_private = data; | 2006 | inode->i_private = data; |