Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325562
b: refs/heads/master
c: 7b15e1d
h: refs/heads/master
v: v3
  • Loading branch information
KeyYoung Park authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent c879af0 commit b1bad72
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 25f04ad423e5eb40c33a904db5a0d2c7e3bf08f5
refs/heads/master: 7b15e1d9e342aca6c65f4824f1957f5245fcd87a
3 changes: 2 additions & 1 deletion trunk/drivers/tty/serial/samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b1bad72

Please sign in to comment.