Module Name: src
Committed By: kiyohara
Date: Fri May 14 12:25:19 UTC 2010
Modified Files:
src/sys/dev/ieee1394: firewire.c
Log Message:
May be easy to understand 'pay_len > 0' more than 'paylaod != NULL'.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ieee1394/firewire.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/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.31 src/sys/dev/ieee1394/firewire.c:1.32
--- src/sys/dev/ieee1394/firewire.c:1.31 Mon May 10 12:17:32 2010
+++ src/sys/dev/ieee1394/firewire.c Fri May 14 12:25:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.31 2010/05/10 12:17:32 kiyohara Exp $ */
+/* $NetBSD: firewire.c,v 1.32 2010/05/14 12:25:19 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.31 2010/05/10 12:17:32 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.32 2010/05/14 12:25:19 kiyohara Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -920,9 +920,9 @@
return;
}
fw_xfer_unload(xfer);
- if (xfer->send.payload != NULL)
+ if (xfer->send.pay_len > 0)
kmem_free(xfer->send.payload, xfer->send.pay_len);
- if (xfer->recv.payload != NULL)
+ if (xfer->recv.pay_len > 0)
kmem_free(xfer->recv.payload, xfer->recv.pay_len);
cv_destroy(&xfer->cv);
kmem_free(xfer, sizeof(struct fw_xfer));
