CVS commit: src/sys/dev/i2c

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Mon Dec  6 04:25:36 UTC 2021

Modified Files:
        src/sys/dev/i2c: spdmem_i2c.c

Log Message:
Carefully access to the I2C bus in the match function.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 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.23 src/sys/dev/i2c/spdmem_i2c.c:1.24
--- src/sys/dev/i2c/spdmem_i2c.c:1.23	Tue Nov 30 05:02:29 2021
+++ src/sys/dev/i2c/spdmem_i2c.c	Mon Dec  6 04:25:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem_i2c.c,v 1.23 2021/11/30 05:02:29 msaitoh Exp $ */
+/* $NetBSD: spdmem_i2c.c,v 1.24 2021/12/06 04:25:36 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2007 Nicolas Joly
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.23 2021/11/30 05:02:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.24 2021/12/06 04:25:36 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -117,6 +117,9 @@ spdmem_reset_page(struct spdmem_i2c_soft
 	 */
 	rv = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr, &reg, 1,
 	    &byte0, 1, 0);
+	if (rv != 0)
+		goto error;
+
 	reg = 2;
 	rv |= iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr, &reg, 1,
 	    &byte2, 1, 0);