From: Rolf Eike Beer <eike-kernel@sf-tec.de>
Date: Sun, 27 Aug 2006 08:23:27 +0000 (-0700)
Subject: [PATCH] tty: remove bogus call to cdev_del()
X-Git-Tag: v2.6.18-rc5~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cc36e7f124da139a819ad316c39d9dbcb5ba1897;p=linux-2.6-omap-h63xx.git

[PATCH] tty: remove bogus call to cdev_del()

When cdev_add() failed there is no reason to call cdev_del().

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index bfdb90242a9..d6e4eaa4853 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3094,7 +3094,6 @@ int tty_register_driver(struct tty_driver *driver)
 	driver->cdev.owner = driver->owner;
 	error = cdev_add(&driver->cdev, dev, driver->num);
 	if (error) {
-		cdev_del(&driver->cdev);
 		unregister_chrdev_region(dev, driver->num);
 		driver->ttys = NULL;
 		driver->termios = driver->termios_locked = NULL;