Author: arybchik
Date: Fri Nov 23 10:21:28 2018
New Revision: 340822
URL: https://svnweb.freebsd.org/changeset/base/340822

Log:
  sfxge(4): fix check in NVRAM validate
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week
  Differential Revision:  https://reviews.freebsd.org/D18092

Modified:
  head/sys/dev/sfxge/common/efx_nvram.c

Modified: head/sys/dev/sfxge/common/efx_nvram.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_nvram.c       Fri Nov 23 10:21:17 2018        
(r340821)
+++ head/sys/dev/sfxge/common/efx_nvram.c       Fri Nov 23 10:21:28 2018        
(r340822)
@@ -473,10 +473,11 @@ efx_nvram_validate(
        if ((rc = envop->envo_type_to_partn(enp, type, &partn)) != 0)
                goto fail1;
 
-       if (envop->envo_type_to_partn != NULL &&
-           ((rc = envop->envo_buffer_validate(enp, partn,
-           partn_data, partn_size)) != 0))
-               goto fail2;
+       if (envop->envo_buffer_validate != NULL) {
+               if ((rc = envop->envo_buffer_validate(enp, partn,
+                           partn_data, partn_size)) != 0)
+                       goto fail2;
+       }
 
        return (0);
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to