aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rybchenko <arybchik@FreeBSD.org>2018-11-23 10:21:28 +0000
committerAndrew Rybchenko <arybchik@FreeBSD.org>2018-11-23 10:21:28 +0000
commit6a869fec96cc16cea76b2cd195ec95183f07c2e5 (patch)
tree8eacd6af5175949caa13df9e8c734759b7c3ecee
parent558eb6e7f1b623b063c97119296b1c1b87a31fbd (diff)
downloadsrc-6a869fec96cc16cea76b2cd195ec95183f07c2e5.tar.gz
src-6a869fec96cc16cea76b2cd195ec95183f07c2e5.zip
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
Notes
Notes: svn path=/head/; revision=340822
-rw-r--r--sys/dev/sfxge/common/efx_nvram.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/sfxge/common/efx_nvram.c b/sys/dev/sfxge/common/efx_nvram.c
index a0233bdc180c..639c306a7ed5 100644
--- a/sys/dev/sfxge/common/efx_nvram.c
+++ b/sys/dev/sfxge/common/efx_nvram.c
@@ -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);