Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't fall over if the TOD clock could not be found.

This commit is contained in:
eeh 2001-07-19 23:59:51 +00:00
parent 7e8421fa5b
commit 93d4ebfb55
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/sparc64/sparc64/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.39 2001/01/20 13:44:30 pk Exp $ */
/* $NetBSD: clock.c,v 1.40 2001/07/19 23:59:51 eeh Exp $ */
/*
* Copyright (c) 1992, 1993
@ -136,7 +136,7 @@ struct cfattach clock_ebus_ca = {
extern struct cfdriver clock_cd;
/* Global TOD clock handle & idprom pointer */
static todr_chip_handle_t todr_handle;
static todr_chip_handle_t todr_handle = NULL;
static struct idprom *idprom;
static int timermatch __P((struct device *, struct cfdata *, void *));
@ -828,8 +828,9 @@ inittodr(base)
badbase = 1;
}
if (todr_gettime(todr_handle, (struct timeval *)&time) != 0 ||
time.tv_sec == 0) {
if (todr_handle &&
(todr_gettime(todr_handle, (struct timeval *)&time) != 0 ||
time.tv_sec == 0)) {
printf("WARNING: bad date in battery clock");
/*
* Believe the time in the file system for lack of
@ -867,7 +868,8 @@ resettodr()
return;
sparc_clock_time_is_ok = 1;
if (todr_settime(todr_handle, (struct timeval *)&time) != 0)
if (todr_handle == 0 ||
todr_settime(todr_handle, (struct timeval *)&time) != 0)
printf("Cannot set time in time-of-day clock\n");
}