From 020053a34a7bc4749b2829fd6f9c19ffbcbac7dc Mon Sep 17 00:00:00 2001 From: jhb Date: Mon, 13 Feb 2012 19:52:18 +0000 Subject: [PATCH] MFC 230340: Properly return success once a matching VPD entry is found in pci_get_vpd_readonly_method(). Previously the loop was always running to completion and falling through to failing with ENXIO. git-svn-id: svn://svn.freebsd.org/base/stable/8@231611 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/pci/pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index dc4e315ba..922da82d0 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1076,11 +1076,9 @@ pci_get_vpd_readonly_method(device_t dev, device_t child, const char *kw, if (memcmp(kw, cfg->vpd.vpd_ros[i].keyword, sizeof(cfg->vpd.vpd_ros[i].keyword)) == 0) { *vptr = cfg->vpd.vpd_ros[i].value; + return (0); } - if (i != cfg->vpd.vpd_rocnt) - return (0); - *vptr = NULL; return (ENXIO); } -- 2.45.0