aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eike-kernel@sf-tec.de>2006-10-01 02:27:48 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:22 -0400
commit328a338f6f9943a0a77292315a25628b22f79fed (patch)
treef38a4b110b8d728a5be847e567eafb961b586e88
parentcc088d10d02978641c7a2eecd18caf1e01e597b3 (diff)
[PATCH] rtc: remove superfluous call to call to cdev_del()
If cdev_add() fails there is no good reason to call cdev_del(). Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Cc: Alessandro Zummo <alessandro.zummo@towertech.it> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/rtc/rtc-dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 61a58259c93f..062c0ab3fe35 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -406,7 +406,6 @@ static int rtc_dev_add_device(struct class_device *class_dev,
406 rtc->char_dev.owner = rtc->owner; 406 rtc->char_dev.owner = rtc->owner;
407 407
408 if (cdev_add(&rtc->char_dev, MKDEV(MAJOR(rtc_devt), rtc->id), 1)) { 408 if (cdev_add(&rtc->char_dev, MKDEV(MAJOR(rtc_devt), rtc->id), 1)) {
409 cdev_del(&rtc->char_dev);
410 dev_err(class_dev->dev, 409 dev_err(class_dev->dev,
411 "failed to add char device %d:%d\n", 410 "failed to add char device %d:%d\n",
412 MAJOR(rtc_devt), rtc->id); 411 MAJOR(rtc_devt), rtc->id);