From 0f93211533dae27de2763ff62f3184a63f92c963 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 27 Oct 2010 15:34:18 -0700
Subject: [PATCH] --- yaml --- r: 218576 b: refs/heads/master c:
 713efa9a64fac01abc296228c5ca4f507217a8c9 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/rocket.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fe7cae61c5c7..fcc6aff6a4a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60ee6d5faf5f7920ba88b82c072864596f5b88af
+refs/heads/master: 713efa9a64fac01abc296228c5ca4f507217a8c9
diff --git a/trunk/drivers/char/rocket.c b/trunk/drivers/char/rocket.c
index 7c79d243acc9..86308830ac42 100644
--- a/trunk/drivers/char/rocket.c
+++ b/trunk/drivers/char/rocket.c
@@ -2345,7 +2345,7 @@ static int __init rp_init(void)
 	ret = tty_register_driver(rocket_driver);
 	if (ret < 0) {
 		printk(KERN_ERR "Couldn't install tty RocketPort driver\n");
-		goto err_tty;
+		goto err_controller;
 	}
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -2380,6 +2380,9 @@ static int __init rp_init(void)
 	return 0;
 err_ttyu:
 	tty_unregister_driver(rocket_driver);
+err_controller:
+	if (controller)
+		release_region(controller, 4);
 err_tty:
 	put_tty_driver(rocket_driver);
 err: