Commit 07821d33 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

sh: fix no sys_timer case

Handle the case with a sys_timer set to NULL.
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 70f08001
...@@ -181,7 +181,12 @@ static struct sysdev_class timer_sysclass = { ...@@ -181,7 +181,12 @@ static struct sysdev_class timer_sysclass = {
static int __init timer_init_sysfs(void) static int __init timer_init_sysfs(void)
{ {
int ret = sysdev_class_register(&timer_sysclass); int ret;
if (!sys_timer)
return 0;
ret = sysdev_class_register(&timer_sysclass);
if (ret != 0) if (ret != 0)
return ret; return ret;
...@@ -230,5 +235,8 @@ void __init time_init(void) ...@@ -230,5 +235,8 @@ void __init time_init(void)
* initialized for us. * initialized for us.
*/ */
sys_timer = get_sys_timer(); sys_timer = get_sys_timer();
if (unlikely(!sys_timer))
panic("System timer missing.\n");
printk(KERN_INFO "Using %s for system timer\n", sys_timer->name); printk(KERN_INFO "Using %s for system timer\n", sys_timer->name);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment