Module Name: src
Committed By: drochner
Date: Tue Feb 14 13:51:20 UTC 2012
Modified Files:
src/sys/dev/pcmcia: xirc.c
Log Message:
fix incomplete device_t/softc split which led to crash on attachment,
closes PR kern/45874 by Hauke Fath
approved by releng
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pcmcia/xirc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.32 src/sys/dev/pcmcia/xirc.c:1.33
--- src/sys/dev/pcmcia/xirc.c:1.32 Tue Jan 19 22:07:43 2010
+++ src/sys/dev/pcmcia/xirc.c Tue Feb 14 13:51:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.32 2010/01/19 22:07:43 pooka Exp $ */
+/* $NetBSD: xirc.c,v 1.33 2012/02/14 13:51:19 drochner Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.32 2010/01/19 22:07:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.33 2012/02/14 13:51:19 drochner Exp $");
#include "opt_inet.h"
@@ -602,7 +602,7 @@ int xi_xirc_match(device_t, cfdata_t, vo
void xi_xirc_attach(device_t, device_t, void *);
/* No xirc-specific goo in the softc; it's all in the parent. */
-CFATTACH_DECL(xi_xirc, sizeof(struct xi_softc),
+CFATTACH_DECL_NEW(xi_xirc, sizeof(struct xi_softc),
xi_xirc_match, xi_xirc_attach, xi_detach, NULL);
int xi_xirc_enable(struct xi_softc *);
