From 5cd5fd6da787e4c3be181925cafada10cbb50382 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Aug 2009 16:01:28 -0700
Subject: [PATCH] --- yaml --- r: 163803 b: refs/heads/master c:
 182274f85fc26ec3aa8c78dba8b0e7763af3c586 h: refs/heads/master i:   163801:
 480611b95d11e744ca0b378ca94c9169d5011127   163799:
 a2b3863a0ac1bebda33e541b0d85f3cee1123efe v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/char/tty_ldisc.c | 51 +++++++++++++---------------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 912a9d44e6f5..29c5780b1a3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0de0e8d3565ee7feba6228d99763d4cea2087a6
+refs/heads/master: 182274f85fc26ec3aa8c78dba8b0e7763af3c586
diff --git a/trunk/drivers/char/tty_ldisc.c b/trunk/drivers/char/tty_ldisc.c
index cbfacc0bbea5..aafdbaebc16a 100644
--- a/trunk/drivers/char/tty_ldisc.c
+++ b/trunk/drivers/char/tty_ldisc.c
@@ -174,34 +174,6 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
 	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
 
-/**
- *	tty_ldisc_try_get	-	try and reference an ldisc
- *	@disc: ldisc number
- *
- *	Attempt to open and lock a line discipline into place. Return
- *	the line discipline refcounted or an error.
- */
-
-static struct tty_ldisc *tty_ldisc_try_get(int disc)
-{
-	struct tty_ldisc *ld;
-	struct tty_ldisc_ops *ldops;
-
-	ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
-	if (ld == NULL)
-		return ERR_PTR(-ENOMEM);
-
-	ldops = get_ldops(disc);
-	if (IS_ERR(ldops)) {
-		kfree(ld);
-		return ERR_CAST(ldops);
-	}
-
-	ld->ops = ldops;
-	atomic_set(&ld->users, 1);
-	return ld;
-}
-
 /**
  *	tty_ldisc_get		-	take a reference to an ldisc
  *	@disc: ldisc number
@@ -218,14 +190,31 @@ static struct tty_ldisc *tty_ldisc_try_get(int disc)
 static struct tty_ldisc *tty_ldisc_get(int disc)
 {
 	struct tty_ldisc *ld;
+	struct tty_ldisc_ops *ldops;
 
 	if (disc < N_TTY || disc >= NR_LDISCS)
 		return ERR_PTR(-EINVAL);
-	ld = tty_ldisc_try_get(disc);
-	if (IS_ERR(ld)) {
+
+	/*
+	 * Get the ldisc ops - we may need to request them to be loaded
+	 * dynamically and try again.
+	 */
+	ldops = get_ldops(disc);
+	if (IS_ERR(ldops)) {
 		request_module("tty-ldisc-%d", disc);
-		ld = tty_ldisc_try_get(disc);
+		ldops = get_ldops(disc);
+		if (IS_ERR(ldops))
+			return ERR_CAST(ldops);
+	}
+
+	ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
+	if (ld == NULL) {
+		put_ldops(ldops);
+		return ERR_PTR(-ENOMEM);
 	}
+
+	ld->ops = ldops;
+	atomic_set(&ld->users, 1);
 	return ld;
 }