summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Palatin <vpalatin@chromium.org>2012-10-04 17:13:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:05:02 +0900
commit2830a6d20139df2198d63235df7957712adb28e5 (patch)
tree6883cfb98d7f7254824d2a8f42dba2d1de25f689
parent179a502f8c4605c502f798e18f66ae096fe42402 (diff)
downloadop-kernel-dev-2830a6d20139df2198d63235df7957712adb28e5.zip
op-kernel-dev-2830a6d20139df2198d63235df7957712adb28e5.tar.gz
rtc: recycle id when unloading a rtc driver
When calling rtc_device_unregister, we are not freeing the id used by the driver. So when doing a unload/load cycle for a RTC driver (e.g. rmmod rtc_cmos && modprobe rtc_cmos), its id is incremented by one. As a consequence, we no longer have neither an rtc0 driver nor a /proc/driver/rtc (as it only exists for the first driver). Signed-off-by: Vincent Palatin <vpalatin@chromium.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/class.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index dc4c274..37b1d82 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -238,6 +238,7 @@ void rtc_device_unregister(struct rtc_device *rtc)
rtc_proc_del_device(rtc);
device_unregister(&rtc->dev);
rtc->ops = NULL;
+ ida_simple_remove(&rtc_ida, rtc->id);
mutex_unlock(&rtc->ops_lock);
put_device(&rtc->dev);
}
OpenPOWER on IntegriCloud