diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-05-24 03:45:06 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 03:45:06 -0400 |
| commit | 9b28b11e2a648f07c8481b9666ccf1c088e1ab74 (patch) | |
| tree | ac3db2d4ae69e393d8423bb8c9304c75023dc805 /net/9p | |
| parent | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (diff) | |
| parent | 99aa18278e867574d72201b806f82ace07d4804b (diff) | |
Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/protocol.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/9p/protocol.c b/net/9p/protocol.c index b58a501cf3d1..a873277cb996 100644 --- a/net/9p/protocol.c +++ b/net/9p/protocol.c | |||
| @@ -674,6 +674,7 @@ int p9dirent_read(char *buf, int len, struct p9_dirent *dirent, | |||
| 674 | } | 674 | } |
| 675 | 675 | ||
| 676 | strcpy(dirent->d_name, nameptr); | 676 | strcpy(dirent->d_name, nameptr); |
| 677 | kfree(nameptr); | ||
| 677 | 678 | ||
| 678 | out: | 679 | out: |
| 679 | return fake_pdu.offset; | 680 | return fake_pdu.offset; |