From 41ca73229809eb3d173e316d11d3943d49924209 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 13 Oct 2008 10:31:37 +0100 Subject: drivers/serial/crisv10.c: add missing put_tty_driver alloc_tty_driver is called at the beginning of the function containing the lines of code shown in the patch. Thus, put_tty_driver is needed before returning in the error handling code. The semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @nr exists@ local idexpression x; expression E,f; position p1,p2,p3; identifier l; statement S; @@ x = alloc_tty_driver@p1(...) ... if (x == NULL) S ... when != E = x when != put_tty_driver(x) when != goto l; ( return \(0\|x\); | return@p3 ...; ) @script:python@ p1 << nr.p1; p3 << nr.p3; @@ print "%s: call on line %s not freed or saved before return on line %s" % (p1[0].file,p1[0].line,p3[0].line) // Signed-off-by: Julia Lawall Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/serial/crisv10.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/serial/crisv10.c') diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index bf94a770bb44..a467c77d8a13 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -4419,6 +4419,7 @@ rs_init(void) rs485_pa_bit)) { printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " "RS485 pin\n"); + put_tty_driver(driver); return -EBUSY; } #endif @@ -4427,6 +4428,7 @@ rs_init(void) rs485_port_g_bit)) { printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " "RS485 pin\n"); + put_tty_driver(driver); return -EBUSY; } #endif -- cgit v1.2.3