[src/netbsd-2]: src/sys/dev/ic Pull up revision 1.227 (requested by bouyer in...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d4153d0f0061
branches:  netbsd-2
changeset: 563955:d4153d0f0061
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Aug 13 23:26:04 2005 +0000

description:
Pull up revision 1.227 (requested by bouyer in ticket #5561):
Also initialize wdc->reset in wdcprobe() if the bus back-end didn't provide
one. Prevent NULL pointer dereference when wdcprobe() is called.

diffstat:

 sys/dev/ic/wdc.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r b4c4e7c7b470 -r d4153d0f0061 sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Sat Aug 13 23:14:26 2005 +0000
+++ b/sys/dev/ic/wdc.c  Sat Aug 13 23:26:04 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc.c,v 1.172.2.7.2.4 2005/08/07 15:51:36 riz Exp $ */
+/*     $NetBSD: wdc.c,v 1.172.2.7.2.5 2005/08/13 23:26:04 riz Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.172.2.7.2.4 2005/08/07 15:51:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.172.2.7.2.5 2005/08/13 23:26:04 riz Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -484,6 +484,9 @@
 int
 wdcprobe(struct wdc_channel *chp)
 {
+       /* default reset method */
+       if (wdc->reset == NULL)
+               wdc->reset = wdc_do_reset;
 
        return (wdcprobe1(chp, 1));
 }