Skip to content

Commit

Permalink
revert "rtc: recycle id when unloading a rtc driver"
Browse files Browse the repository at this point in the history
Revert commit 2830a6d.

We already perform the ida_simple_remove() in rtc_device_release(),
which is an appropriate place.  Commit 2830a6d ("rtc: recycle id when
unloading a rtc driver") caused the kernel to emit

	ida_remove called for id=0 which is not allocated.

warnings when rtc_device_release() tries to release an alread-released
ID.

Let's restore things to their previous state and then work out why
Vincent's kernel wasn't calling rtc_device_release() - presumably a bug
in a specific sub-driver.

Reported-by: Lothar Waßmann <[email protected]>
Acked-by: Alexander Holler <[email protected]>
Cc: Vincent Palatin <[email protected]>
Cc: <[email protected]>		[3.7.x]
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
akpm00 authored and torvalds committed Dec 21, 2012
1 parent 2c79737 commit 5abe257
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/rtc/class.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ 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);
}
Expand Down

0 comments on commit 5abe257

Please sign in to comment.