diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:04 -0400 |
commit | 79f662334fefa2dd3fdf66c44a4d2dca5e378ab4 (patch) | |
tree | e11b6def260959aa90e8ed0823a700f7e0cdaf2c | |
parent | 8e2d10e1e76d894ec73d66dd63b641ccf5f5fb67 (diff) |
uml: fix error cleanup ordering
I messed up the error cleanup ordering in the console port driver.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/um/drivers/port_kern.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c index 1c8efd95c421..d8acf7470e70 100644 --- a/arch/um/drivers/port_kern.c +++ b/arch/um/drivers/port_kern.c | |||
@@ -216,10 +216,10 @@ void *port_data(int port_num) | |||
216 | .telnetd_pid = -1 }); | 216 | .telnetd_pid = -1 }); |
217 | goto out; | 217 | goto out; |
218 | 218 | ||
219 | out_free: | ||
220 | kfree(port); | ||
221 | out_close: | 219 | out_close: |
222 | os_close_file(fd); | 220 | os_close_file(fd); |
221 | out_free: | ||
222 | kfree(port); | ||
223 | out: | 223 | out: |
224 | up(&ports_sem); | 224 | up(&ports_sem); |
225 | return dev; | 225 | return dev; |