Merge ../linus

Conflicts:

	drivers/char/agp/Kconfig

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 413c7d54ea10..1cb61a761cb2 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -69,6 +69,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc->id = id;
         rtc->ops = ops;
         rtc->owner = owner;
+        rtc->max_user_freq = 64;
         rtc->class_dev.dev = dev;
         rtc->class_dev.class = rtc_class;
         rtc->class_dev.release = rtc_device_release;
@@ -93,7 +94,9 @@ exit_kfree:
         kfree(rtc);
 
 exit_idr:
+        mutex_lock(&idr_lock);
         idr_remove(&rtc_idr, id);
+        mutex_unlock(&idr_lock);
 
 exit:
         dev_err(dev, "rtc core: unable to register %s, err = %d\n",