diff options
| author | cube <cube@NetBSD.org> | 2006-08-07 11:39:30 +0000 |
|---|---|---|
| committer | cube <cube@NetBSD.org> | 2006-08-07 11:39:30 +0000 |
| commit | bb041282a1e8ff0ea6ccde883ea9123fce88d8e6 (patch) | |
| tree | 96a5b9f7fb2c02445dcc224aa00c36fa383f0062 /sys | |
| parent | 08605a2dd4db9fb61702420e2db0d730042da353 (diff) | |
Correctly free freq_names and cstate.
XXX This code is bogus anyway. Global variables vs. MP systems, anyone?
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/powernow_k8.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/i386/powernow_k7.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/amd64/amd64/powernow_k8.c b/sys/arch/amd64/amd64/powernow_k8.c index 90b7a6244ea..be22fbc6624 100644 --- a/sys/arch/amd64/amd64/powernow_k8.c +++ b/sys/arch/amd64/amd64/powernow_k8.c @@ -1,4 +1,4 @@ -/* $NetBSD: powernow_k8.c,v 1.2 2006/08/06 18:21:32 xtraeme Exp $ */ +/* $NetBSD: powernow_k8.c,v 1.3 2006/08/07 11:39:30 cube Exp $ */ /* $OpenBSD: powernow-k8.c,v 1.8 2006/06/16 05:58:50 gwk Exp $ */ /*- @@ -89,7 +89,7 @@ /* AMD POWERNOW K8 driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: powernow_k8.c,v 1.2 2006/08/06 18:21:32 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: powernow_k8.c,v 1.3 2006/08/07 11:39:30 cube Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -420,7 +420,8 @@ k8_powernow_init(void) if (k8pnow_current_state == NULL) { free(cstate, M_DEVBUF); - free(freq_names, M_SYSCTLDATA); + if (freq_names) + free(freq_names, M_SYSCTLDATA); return; } @@ -476,6 +477,6 @@ k8_powernow_init(void) return; err: - if (freq_names) - free(freq_names, M_SYSCTLDATA); + free(cstate, M_DEVBUF); + free(freq_names, M_SYSCTLDATA); } diff --git a/sys/arch/i386/i386/powernow_k7.c b/sys/arch/i386/i386/powernow_k7.c index 77381af12e9..e9df82a68dd 100644 --- a/sys/arch/i386/i386/powernow_k7.c +++ b/sys/arch/i386/i386/powernow_k7.c @@ -1,4 +1,4 @@ -/* $NetBSD: powernow_k7.c,v 1.11 2006/08/06 18:21:32 xtraeme Exp $ */ +/* $NetBSD: powernow_k7.c,v 1.12 2006/08/07 11:39:30 cube Exp $ */ /* $OpenBSD: powernow-k7.c,v 1.24 2006/06/16 05:58:50 gwk Exp $ */ /*- @@ -89,7 +89,7 @@ /* AMD POWERNOW K7 driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: powernow_k7.c,v 1.11 2006/08/06 18:21:32 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: powernow_k7.c,v 1.12 2006/08/07 11:39:30 cube Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -382,7 +382,8 @@ k7_powernow_init(void) } if (k7pnow_current_state == NULL) { - free(freq_names, M_SYSCTLDATA); + if (freq_names) + free(freq_names, M_SYSCTLDATA); free(cstate, M_DEVBUF); return; } @@ -444,8 +445,8 @@ k7_powernow_init(void) return; err: - if (freq_names) - free(freq_names, M_SYSCTLDATA); + free(freq_names, M_SYSCTLDATA); + free(cstate, M_DEVBUF); } void |
