diff options
author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-06-25 17:55:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:35 -0400 |
commit | 41f2148a67f28803d64bf5ff538591af90a5ab57 (patch) | |
tree | 7bfc5f1a1d7101a643fd581f907f32a9b7503206 /arch/um/drivers | |
parent | 350d5bd84ecda038bb482ab5f2596bdca68109d9 (diff) |
[PATCH] uml: kfree cleanup
Here's a small patch to remove a few unnessesary NULL pointer checks before
kfree() in arch/um/drivers/daemon_user.c
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers')
-rw-r--r-- | arch/um/drivers/daemon_user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c index cf15b4a8b517..c1b03f7c1daa 100644 --- a/arch/um/drivers/daemon_user.c +++ b/arch/um/drivers/daemon_user.c | |||
@@ -157,9 +157,9 @@ static void daemon_remove(void *data) | |||
157 | 157 | ||
158 | os_close_file(pri->fd); | 158 | os_close_file(pri->fd); |
159 | os_close_file(pri->control); | 159 | os_close_file(pri->control); |
160 | if(pri->data_addr != NULL) kfree(pri->data_addr); | 160 | kfree(pri->data_addr); |
161 | if(pri->ctl_addr != NULL) kfree(pri->ctl_addr); | 161 | kfree(pri->ctl_addr); |
162 | if(pri->local_addr != NULL) kfree(pri->local_addr); | 162 | kfree(pri->local_addr); |
163 | } | 163 | } |
164 | 164 | ||
165 | int daemon_user_write(int fd, void *buf, int len, struct daemon_data *pri) | 165 | int daemon_user_write(int fd, void *buf, int len, struct daemon_data *pri) |