summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2006-09-02 18:58:02 +0000
committerchristos <christos@NetBSD.org>2006-09-02 18:58:02 +0000
commitbd4bd1bf9d2c5092ea5e46c8bac8390a9664e5dc (patch)
treece7eb1a68790aeb715638e431e61d631f3295a9a /sys/dev
parentc8b1a4622fef0c424f59e7ebcf3b71a5f214a6fd (diff)
- comment out impossible comparison
- add missing initializer
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pcmcia/pcmcia_cis.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index 9994fe82ea4..b6763279346 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia_cis.c,v 1.46 2006/04/08 20:55:22 christos Exp $ */
+/* $NetBSD: pcmcia_cis.c,v 1.47 2006/09/02 18:58:02 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.46 2006/04/08 20:55:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.47 2006/09/02 18:58:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -305,7 +305,9 @@ pcmcia_scan_cis(dev, fct, arg)
* distant regions
*/
if ((addr >= PCMCIA_CIS_SIZE) ||
+#if 0
((addr + length) < 0) ||
+#endif
((addr + length) >=
PCMCIA_CIS_SIZE)) {
DPRINTF((" skipped, "
@@ -996,7 +998,7 @@ decode_config(struct pcmcia_tuple *tuple, struct cis_state *state)
/* most of these are educated guesses */
static const struct pcmcia_config_entry init_cfe = {
-1, PCMCIA_CFE_RDYBSY_ACTIVE | PCMCIA_CFE_WP_ACTIVE |
- PCMCIA_CFE_BVD_ACTIVE, PCMCIA_IFTYPE_MEMORY,
+ PCMCIA_CFE_BVD_ACTIVE, PCMCIA_IFTYPE_MEMORY, 0,
};
if (tuple->length < 3) {