diff --git a/[refs] b/[refs]
index 675f607b191f..126d145a3d1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 819a3eba4233ffc6c125e1bf0a15ae093b97c3a6
+refs/heads/master: cf85d5ca880c9611906e0ca0c729fdf01c724501
diff --git a/trunk/drivers/char/lcd.c b/trunk/drivers/char/lcd.c
index cf01a720eb2e..b77161146144 100644
--- a/trunk/drivers/char/lcd.c
+++ b/trunk/drivers/char/lcd.c
@@ -613,10 +613,15 @@ static struct miscdevice lcd_dev = {
 
 static int lcd_init(void)
 {
+	int ret;
 	unsigned long data;
 
 	pr_info("%s\n", LCD_DRIVER);
-	misc_register(&lcd_dev);
+	ret = misc_register(&lcd_dev);
+	if (ret) {
+		printk(KERN_WARNING LCD "Unable to register misc device.\n");
+		return ret;
+	}
 
 	/* Check region? Naaah! Just snarf it up. */
 /*	request_region(RTC_PORT(0), RTC_IO_EXTENT, "lcd");*/