Print this page
6659 nvlist_free(NULL) is a no-op

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/os/devid_cache.c
          +++ new/usr/src/uts/common/os/devid_cache.c
↓ open down ↓ 335 lines elided ↑ open up ↑
 336  336                              nvf_cache_name(fd), rval);
 337  337                          goto err;
 338  338                  }
 339  339                  nvlist_free(sub_nvl);
 340  340          }
 341  341  
 342  342          *ret_nvl = nvl;
 343  343          return (DDI_SUCCESS);
 344  344  
 345  345  err:
 346      -        if (sub_nvl)
 347      -                nvlist_free(sub_nvl);
      346 +        nvlist_free(sub_nvl);
 348  347          nvlist_free(nvl);
 349  348          *ret_nvl = NULL;
 350  349          return (DDI_FAILURE);
 351  350  }
 352  351  
 353  352  static int
 354  353  e_devid_do_discovery(void)
 355  354  {
 356  355          ASSERT(mutex_owned(&devid_discovery_mutex));
 357  356  
↓ open down ↓ 814 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX