diff --git a/[refs] b/[refs]
index 9c031f8cfa3a..c99f7bf52ce8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 753ca4f312a4b26940e4731b4fa5dbbbbcc77e97
+refs/heads/master: 5e66b0b5f187c811419ff10cfb5668c028a64d57
diff --git a/trunk/drivers/char/tlclk.c b/trunk/drivers/char/tlclk.c
index 2444a0e24b31..244d30a03fef 100644
--- a/trunk/drivers/char/tlclk.c
+++ b/trunk/drivers/char/tlclk.c
@@ -792,15 +792,14 @@ static int __init tlclk_init(void)
 	ret = misc_register(&tlclk_miscdev);
 	if (ret < 0) {
 		printk(KERN_ERR "tlclk: misc_register returns %d.\n", ret);
-		ret = -EBUSY;
 		goto out3;
 	}
 
 	tlclk_device = platform_device_register_simple("telco_clock",
 				-1, NULL, 0);
-	if (!tlclk_device) {
+	if (IS_ERR(tlclk_device)) {
 		printk(KERN_ERR "tlclk: platform_device_register failed.\n");
-		ret = -EBUSY;
+		ret = PTR_ERR(tlclk_device);
 		goto out4;
 	}