aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/pccard
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2005-02-17 21:05:04 +0000
committerWarner Losh <imp@FreeBSD.org>2005-02-17 21:05:04 +0000
commite8c3bb6966a34bd3c6b9ee098f1dceb0fd5ffa68 (patch)
treeea61f3944f6e1b1c03e94d082d316c08d3f8cef7 /sys/dev/pccard
parent7a824c37567eb300a9776b9b6f02ff214f847886 (diff)
Notes
Diffstat (limited to 'sys/dev/pccard')
-rw-r--r--sys/dev/pccard/pccard_cis.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index 4286208460c9..fce85e7c3ddc 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -1142,9 +1142,7 @@ pccard_parse_cis_tuple(struct pccard_tuple *tuple, void *arg)
goto abort_cfe;
}
- if (memspace == PCCARD_TPCE_FS_MEMSPACE_NONE) {
- cfe->num_memspace = 0;
- } else if (memspace == PCCARD_TPCE_FS_MEMSPACE_LENGTH) {
+ if (memspace == PCCARD_TPCE_FS_MEMSPACE_LENGTH) {
cfe->num_memspace = 1;
cfe->memspace[0].length = 256 *
pccard_tuple_read_2(tuple, idx);
@@ -1227,7 +1225,8 @@ pccard_parse_cis_tuple(struct pccard_tuple *tuple, void *arg)
}
}
}
- }
+ } else
+ cfe->num_memspace = 0;
if (misc) {
if (tuple->length <= idx) {
DPRINTF(("ran out of space before TCPE_MI\n"));