diff --git a/[refs] b/[refs]
index 34917cd1b06e..6e7ba642790a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25f04ad423e5eb40c33a904db5a0d2c7e3bf08f5
+refs/heads/master: 7b15e1d9e342aca6c65f4824f1957f5245fcd87a
diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c
index cefdd2d7c58c..d57f165d6be8 100644
--- a/trunk/drivers/tty/serial/samsung.c
+++ b/trunk/drivers/tty/serial/samsung.c
@@ -1162,7 +1162,8 @@ static ssize_t s3c24xx_serial_show_clksrc(struct device *dev,
 	if (IS_ERR(ourport->baudclk))
 		return -EINVAL;
 
-	return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->baudclk->name);
+	return snprintf(buf, PAGE_SIZE, "* %s\n",
+			ourport->baudclk->name ?: "(null)");
 }
 
 static DEVICE_ATTR(clock_source, S_IRUGO, s3c24xx_serial_show_clksrc, NULL);