diff --git a/[refs] b/[refs]
index 22d628d1ad2d..a47880c9b64e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c4746c24728a047a1ef985215edec798bfce1f
+refs/heads/master: 9ed39bf931cbd95b30755dcb1ad724fe05565c3f
diff --git a/trunk/drivers/rtc/rtc-davinci.c b/trunk/drivers/rtc/rtc-davinci.c
index 14c2109dbaa3..fd95316743c9 100644
--- a/trunk/drivers/rtc/rtc-davinci.c
+++ b/trunk/drivers/rtc/rtc-davinci.c
@@ -529,8 +529,9 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
 	davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
 				    &davinci_rtc_ops, THIS_MODULE);
 	if (IS_ERR(davinci_rtc->rtc)) {
-		dev_err(dev, "unable to register RTC device, err %ld\n",
-				PTR_ERR(davinci_rtc->rtc));
+		ret = PTR_ERR(davinci_rtc->rtc);
+		dev_err(dev, "unable to register RTC device, err %d\n",
+				ret);
 		goto fail3;
 	}