aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/xe
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2003-04-10 04:36:02 +0000
committerWarner Losh <imp@FreeBSD.org>2003-04-10 04:36:02 +0000
commitf5746231ff7652f580d3f8f8ecec3f5fe47f1bdb (patch)
treeb753190964ccbd5954520469be2512025019f370 /sys/dev/xe
parent2701fed4cf6398e814d04b0ff1f06d04c840e7f1 (diff)
downloadsrc-f5746231ff7652f580d3f8f8ecec3f5fe47f1bdb.tar.gz
src-f5746231ff7652f580d3f8f8ecec3f5fe47f1bdb.zip
Make sure that pp_name is non-null before setting the device
description. This allows us to rely entirely on the CIS entries if necessary...
Notes
Notes: svn path=/head/; revision=113315
Diffstat (limited to 'sys/dev/xe')
-rw-r--r--sys/dev/xe/if_xe_pccard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index 83a0a8f0e1f7..fcebdc2a1f0a 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -328,7 +328,8 @@ xe_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, xe_pccard_products,
sizeof(xe_pccard_products[0]), NULL)) != NULL) {
- device_set_desc(dev, pp->pp_name);
+ if (pp->pp_name != NULL)
+ device_set_desc(dev, pp->pp_name);
return (0);
}
return (EIO);