svn commit: r342491 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Wed Dec 26 10:00:25 2018
New Revision: 342491
URL: https://svnweb.freebsd.org/changeset/base/342491

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

Modified:
  stable/10/sys/dev/sfxge/common/efx_nvram.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_nvram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_nvram.c	Wed Dec 26 09:59:24 2018	(r342490)
+++ stable/10/sys/dev/sfxge/common/efx_nvram.c	Wed Dec 26 10:00:25 2018	(r342491)
@@ -460,10 +460,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);