From: Phong Tran <tranmanphong@gmail.com>
Date: Wed, 10 Jun 2015 14:03:17 +0000 (+0700)
Subject: greybus: uart: fix the clean up while uart initiates connection unsucessfully
X-Git-Tag: android-x86-7.1-r1~621^2~378^2~21^2~1471
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=55a8e3550364a35bc5d40fa0e445049a5df62627;p=android-x86%2Fkernel.git

greybus: uart: fix the clean up while uart initiates connection unsucessfully

There is lack of unregister and free the tty driver.
This patch fixes it.

Signed-off-by: Phong Tran <tranmanphong@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 7e94632a581b..20928702a5b2 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -586,20 +586,22 @@ static int gb_uart_connection_init(struct gb_connection *connection)
 	}
 
 	gb_tty = kzalloc(sizeof(*gb_tty), GFP_KERNEL);
-	if (!gb_tty)
-		return -ENOMEM;
+	if (!gb_tty) {
+		retval = -ENOMEM;
+		goto error_alloc;
+	}
 
 	gb_tty->buffer_payload_max =
 		gb_operation_get_payload_size_max(connection);
 	if (!gb_tty->buffer_payload_max) {
-		kfree(gb_tty);
-		return -EINVAL;
+		retval = -EINVAL;
+		goto error_payload;
 	}
 
 	gb_tty->buffer = kzalloc(gb_tty->buffer_payload_max, GFP_KERNEL);
 	if (!gb_tty->buffer) {
-		kfree(gb_tty);
-		return -ENOMEM;
+		retval = -ENOMEM;
+		goto error_payload;
 	}
 
 	gb_tty->connection = connection;
@@ -654,7 +656,11 @@ error:
 error_version:
 	connection->private = NULL;
 	kfree(gb_tty->buffer);
+error_payload:
 	kfree(gb_tty);
+error_alloc:
+	if (atomic_dec_return(&reference_count) == 0)
+		gb_tty_exit();
 	return retval;
 }