Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 565562ba6ac9..e6539cbabb35 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -158,8 +158,10 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc_dev_prepare(rtc);
 
         err = device_register(&rtc->dev);
-        if (err)
+        if (err) {
+                put_device(&rtc->dev);
                 goto exit_kfree;
+        }
 
         rtc_dev_add_device(rtc);
         rtc_sysfs_add_device(rtc);