Date: Fri, 21 Dec 2018 15:03:45 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r342309 - stable/12/sys/dev/sfxge/common Message-ID: <201812211503.wBLF3jqo035977@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Fri Dec 21 15:03:44 2018 New Revision: 342309 URL: https://svnweb.freebsd.org/changeset/base/342309 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/12/sys/dev/sfxge/common/efx_nvram.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/sfxge/common/efx_nvram.c ============================================================================== --- stable/12/sys/dev/sfxge/common/efx_nvram.c Fri Dec 21 15:02:36 2018 (r342308) +++ stable/12/sys/dev/sfxge/common/efx_nvram.c Fri Dec 21 15:03:44 2018 (r342309) @@ -462,10 +462,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812211503.wBLF3jqo035977>