Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/devfm.c
          +++ new/usr/src/uts/common/io/devfm.c
↓ open down ↓ 290 lines elided ↑ open up ↑
 291  291                          return (EFAULT);
 292  292                  }
 293  293                  err = nvlist_unpack(buf, fid.fid_insz, &invl, KM_SLEEP);
 294  294                  kmem_free(buf, fid.fid_insz);
 295  295                  if (err != 0)
 296  296                          return (err);
 297  297          }
 298  298  
 299  299          err = subr->func(cmd, invl, &onvl);
 300  300  
 301      -        if (invl != NULL)
 302      -                nvlist_free(invl);
      301 +        nvlist_free(invl);
 303  302  
 304  303          if (err != 0) {
 305      -                if (onvl != NULL)
 306      -                        nvlist_free(onvl);
      304 +                nvlist_free(onvl);
 307  305                  return (err);
 308  306          }
 309  307  
 310  308          /*
 311  309           * If the output nvlist contains any data, pack it and copyout.
 312  310           */
 313  311          if (onvl != NULL) {
 314  312                  size_t sz;
 315  313  
 316  314                  if ((err = nvlist_size(onvl, &sz, NV_ENCODE_NATIVE)) != 0) {
↓ open down ↓ 101 lines elided ↑ open up ↑
 418  416  {
 419  417          return (mod_info(&modlinkage, modinfop));
 420  418  }
 421  419  
 422  420  int
 423  421  _fini(void)
 424  422  {
 425  423          int ret;
 426  424  
 427  425          if ((ret = mod_remove(&modlinkage)) == 0) {
 428      -                if (fm_vers_nvl != NULL)
 429      -                        nvlist_free(fm_vers_nvl);
      426 +                nvlist_free(fm_vers_nvl);
 430  427          }
 431  428  
 432  429          return (ret);
 433  430  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX