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

Fix device name in {fwohci,firewire}_print(). valiable aux is not string 

pointer.
This commit is contained in:
kiyohara 2006-09-26 02:50:42 +00:00
parent b11beef4fa
commit 58f6bfaae5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/ieee1394/firewire.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: firewire.c,v 1.8 2006/06/13 02:39:11 christos Exp $ */ /* $NetBSD: firewire.c,v 1.9 2006/09/26 02:50:42 kiyohara Exp $ */
/*- /*-
* Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@ -602,10 +602,10 @@ firewire_shutdown( device_t dev )
int int
firewire_print(void *aux, const char *pnp) firewire_print(void *aux, const char *pnp)
{ {
char *name = aux; struct fw_attach_args *fwa = (struct fw_attach_args *)aux;
if (pnp) if (pnp)
aprint_normal("%s at %s", name, pnp); aprint_normal("%s at %s", fwa->name, pnp);
return UNCONF; return UNCONF;
} }

8
sys/dev/ieee1394/fwohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwohci.c,v 1.100 2006/05/28 13:01:46 blymn Exp $ */ /* $NetBSD: fwohci.c,v 1.101 2006/09/26 02:50:42 kiyohara Exp $ */
/*- /*-
* Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 2003 Hidetoshi Shimokawa
@ -58,7 +58,7 @@
#include <sys/ktr.h> #include <sys/ktr.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.100 2006/05/28 13:01:46 blymn Exp $"); __KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.101 2006/09/26 02:50:42 kiyohara Exp $");
#if defined(__DragonFly__) || __FreeBSD_version < 500000 #if defined(__DragonFly__) || __FreeBSD_version < 500000
#include <machine/clock.h> /* for DELAY() */ #include <machine/clock.h> /* for DELAY() */
@ -3117,10 +3117,10 @@ err:
int int
fwohci_print(void *aux, const char *pnp) fwohci_print(void *aux, const char *pnp)
{ {
char *name = aux; struct fw_attach_args *fwa = (struct fw_attach_args *)aux;
if (pnp) if (pnp)
aprint_normal("%s at %s", name, pnp); aprint_normal("%s at %s", fwa->name, pnp);
return UNCONF; return UNCONF;
} }