diff options
author | Warner Losh <imp@FreeBSD.org> | 2003-04-10 04:36:02 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2003-04-10 04:36:02 +0000 |
commit | f5746231ff7652f580d3f8f8ecec3f5fe47f1bdb (patch) | |
tree | b753190964ccbd5954520469be2512025019f370 /sys/dev/awi | |
parent | 2701fed4cf6398e814d04b0ff1f06d04c840e7f1 (diff) | |
download | src-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/awi')
-rw-r--r-- | sys/dev/awi/if_awi_pccard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c index d9c3b5917c10..4e6150d99073 100644 --- a/sys/dev/awi/if_awi_pccard.c +++ b/sys/dev/awi/if_awi_pccard.c @@ -85,7 +85,8 @@ awi_pccard_match(device_t dev) if ((pp = pccard_product_lookup(dev, awi_pccard_products, sizeof(awi_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 ENXIO; |