summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorkristerw <kristerw@NetBSD.org>2002-10-06 23:17:46 +0000
committerkristerw <kristerw@NetBSD.org>2002-10-06 23:17:46 +0000
commite20c7acad89da3bebe48bb2beb7e9753a18426bf (patch)
tree54f2aa494b54fefeb380edf7e9430c712123056e /sys/dev
parentbebbf91a393d552f2fdd84651bc9f2fa6cc439ce (diff)
Do not free uninitialize pointers.
Do not try to print with uninitialized format-string pointers.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/mlx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index b60351ebaa9..33bacae1b60 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.22 2002/09/27 03:18:13 thorpej Exp $ */
+/* $NetBSD: mlx.c,v 1.23 2002/10/06 23:17:46 kristerw Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.22 2002/09/27 03:18:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.23 2002/10/06 23:17:46 kristerw Exp $");
#include "ld.h"
@@ -602,7 +602,6 @@ mlx_configure(struct mlx_softc *mlx, int waitok)
if (mes == NULL) {
printf("%s: error fetching drive status\n",
mlx->mlx_dv.dv_xname);
- free(me, M_DEVBUF);
goto out;
}
@@ -2219,7 +2218,7 @@ mlx_fw_message(struct mlx_softc *mlx, int error, int param1, int param2)
mlx->mlx_dv.dv_xname);
mlx->mlx_flags |= MLXF_SPINUP_REPORTED;
}
- break;
+ return (0);
case 0x30:
fmt = "configuration checksum error";
@@ -2250,7 +2249,8 @@ mlx_fw_message(struct mlx_softc *mlx, int error, int param1, int param2)
break;
case 0xf0:
- fmt = "FATAL MEMORY PARITY ERROR";
+ printf("%s: FATAL MEMORY PARITY ERROR\n",
+ mlx->mlx_dv.dv_xname);
return (1);
default: