Subject: Re: CVS commit: src/sys/dev/ic
To: Manuel Bouyer <bouyer@netbsd.org>
From: Rui Paulo <rpaulo@NetBSD.org>
List: source-changes
Date: 08/10/2005 14:11:16
--k1lZvvs/B4yU6o8G
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On 2005.08.10 11:16:54 +0000, Manuel Bouyer wrote:
|=20
| Module Name: src
| Committed By: bouyer
| Date: Wed Aug 10 11:16:53 UTC 2005
|=20
| Modified Files:
| src/sys/dev/ic: wdc.c
|=20
| Log Message:
| Also initialize wdc->reset in wdcprobe() if the bus back-end didn't provi=
de
| one. Prevent NULL pointer dereference when wdcprobe() is called.
I think there is a line missing:
Index: sys/dev/ic/wdc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/sys/dev/ic/wdc.c,v
retrieving revision 1.227
diff -u -p -r1.227 wdc.c
--- sys/dev/ic/wdc.c 10 Aug 2005 11:16:53 -0000 1.227
+++ sys/dev/ic/wdc.c 10 Aug 2005 13:11:57 -0000
@@ -397,6 +397,8 @@ wdc_drvprobe(struct ata_channel *chp)
int
wdcprobe(struct ata_channel *chp)
{
+ struct wdc_softc *wdc =3D CHAN_TO_WDC(chp);
+
/* default reset method */
if (wdc->reset =3D=3D NULL)
wdc->reset =3D wdc_do_reset;
-- Rui Paulo
--k1lZvvs/B4yU6o8G
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFC+fzzZPqyxs9FH4QRAn2cAJ0QnOAwazDner6Dl5RpGQWV2EzQNwCfdhEg
0hUI70VqgFgaGk3PB3+dFow=
=kbvg
-----END PGP SIGNATURE-----
--k1lZvvs/B4yU6o8G--