d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that pp_name is non-null before setting the device

Browse Source 
description.  This allows us to rely entirely on the CIS entries if
necessary...
This commit is contained in:
Warner Losh 2003-04-10 04:36:02 +00:00
parent 2701fed4cf
commit f5746231ff
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113315
11 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/aic/aic_pccard.c
View File

@ -113,7 +113,8 @@ aic_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, aic_pccard_products,
sizeof(aic_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;

3
sys/dev/an/if_an_pccard.c
View File

@ -122,7 +122,8 @@ an_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, an_pccard_products,
sizeof(an_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);

3
sys/dev/awi/if_awi_pccard.c
View File

@ -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;

3
sys/dev/cs/if_cs_pccard.c
View File

@ -58,7 +58,8 @@ cs_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, cs_pccard_products,
sizeof(cs_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;

3
sys/dev/ep/if_ep_pccard.c
View File

@ -254,7 +254,8 @@ ep_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, ep_pccard_products,
sizeof(ep_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;

3
sys/dev/fe/if_fe_pccard.c
View File

@ -82,7 +82,8 @@ fe_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev,
(const struct pccard_product *)fe_pccard_products,
sizeof(fe_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;

3
sys/dev/ncv/ncr53c500_pccard.c
View File

@ -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);
}

3
sys/dev/sn/if_sn_pccard.c
View File

@ -69,7 +69,8 @@ sn_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, sn_pccard_products,
sizeof(sn_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;

3
sys/dev/stg/tmc18c30_pccard.c
View File

@ -87,7 +87,8 @@ static int stg_pccard_match(device_t dev)
if ((pp = pccard_product_lookup(dev, stg_products,
sizeof(stg_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);

2
sys/dev/wi/if_wi_pccard.c
View File

@ -169,7 +169,7 @@ wi_pccard_match(dev)
if ((pp = pccard_product_lookup(dev, wi_pccard_products,
sizeof(wi_pccard_products[0]), NULL)) != NULL) {
if (pp->pp_name)
if (pp->pp_name != NULL)
device_set_desc(dev, pp->pp_name);
return (0);
}

3
sys/dev/xe/if_xe_pccard.c
View File

@ -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);