Module Name: src Committed By: thorpej Date: Sun May 16 22:56:48 UTC 2021
Modified Files: src/sys/dev/i2c [thorpej-i2c-spi-conf]: spdmem_i2c.c Log Message: Tweak previous to deal better with "device tree node describes empty DIMM slot" problem. To generate a diff of this commit: cvs rdiff -u -r1.21.4.4 -r1.21.4.5 src/sys/dev/i2c/spdmem_i2c.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/i2c/spdmem_i2c.c diff -u src/sys/dev/i2c/spdmem_i2c.c:1.21.4.4 src/sys/dev/i2c/spdmem_i2c.c:1.21.4.5 --- src/sys/dev/i2c/spdmem_i2c.c:1.21.4.4 Sun May 16 22:53:57 2021 +++ src/sys/dev/i2c/spdmem_i2c.c Sun May 16 22:56:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: spdmem_i2c.c,v 1.21.4.4 2021/05/16 22:53:57 thorpej Exp $ */ +/* $NetBSD: spdmem_i2c.c,v 1.21.4.5 2021/05/16 22:56:47 thorpej Exp $ */ /* * Copyright (c) 2007 Nicolas Joly @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.21.4.4 2021/05/16 22:53:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.21.4.5 2021/05/16 22:56:47 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -243,7 +243,7 @@ spdmem_i2c_match(device_t parent, cfdata sc.sc_page0 = SPDCTL_SPA0; sc.sc_page1 = SPDCTL_SPA1; sc.sc_base.sc_read = spdmem_i2c_read; - match_result = SPDMEM_HIGH_CONFIDENCE_MATCH; + match_result = 0; do_probe: /* Check the bank and reset to the page 0 */ @@ -254,8 +254,6 @@ spdmem_i2c_match(device_t parent, cfdata if (match_result < SPDMEM_HIGH_CONFIDENCE_MATCH) { match_result = SPDMEM_HIGH_CONFIDENCE_MATCH; } - } else { - match_result = 0; } return match_result;