diff options
| author | imp <imp@FreeBSD.org> | 2003-04-10 04:36:02 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-04-10 04:36:02 +0000 |
| commit | 0b41fd998b452c7ec8d7ba1da74ab2d3aeca7668 (patch) | |
| tree | b753190964ccbd5954520469be2512025019f370 /sys/dev/ncv | |
| parent | b8eb5e1cd083ce0919059e4dd7b1fac281f14613 (diff) | |
| download | FreeBSD-src-0b41fd998b452c7ec8d7ba1da74ab2d3aeca7668.zip FreeBSD-src-0b41fd998b452c7ec8d7ba1da74ab2d3aeca7668.tar.gz | |
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...
Diffstat (limited to 'sys/dev/ncv')
| -rw-r--r-- | sys/dev/ncv/ncr53c500_pccard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index 16eea9f..cfa4402 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -210,7 +210,8 @@ static int ncv_pccard_match(device_t dev) if ((pp = (const struct ncv_product *) pccard_product_lookup(dev, (const struct pccard_product *) ncv_products, sizeof(ncv_products[0]), NULL)) != NULL) { - device_set_desc(dev, pp->prod.pp_name); + if (pp->prod.pp_name != NULL) + device_set_desc(dev, pp->prod.pp_name); device_set_flags(dev, pp->flags); return(0); } |
