Module Name: src
Committed By: thorpej
Date: Sun May 16 15:40:20 UTC 2021
Modified Files:
src/sys/dev/i2c [thorpej-i2c-spi-conf]: spdmem_i2c.c
Log Message:
Check for errors from iic_acquire_bus().
To generate a diff of this commit:
cvs rdiff -u -r1.21.4.2 -r1.21.4.3 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.2 src/sys/dev/i2c/spdmem_i2c.c:1.21.4.3
--- src/sys/dev/i2c/spdmem_i2c.c:1.21.4.2 Sun May 16 15:27:12 2021
+++ src/sys/dev/i2c/spdmem_i2c.c Sun May 16 15:40:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem_i2c.c,v 1.21.4.2 2021/05/16 15:27:12 thorpej Exp $ */
+/* $NetBSD: spdmem_i2c.c,v 1.21.4.3 2021/05/16 15:40:20 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.2 2021/05/16 15:27:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.21.4.3 2021/05/16 15:40:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -107,7 +107,9 @@ spdmem_reset_page(struct spdmem_i2c_soft
reg = 0;
- iic_acquire_bus(sc->sc_tag, 0);
+ if ((rv = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
+ return rv;
+ }
/*
* Try to read byte 0 and 2. If it failed, it's not spdmem or a device
@@ -306,7 +308,8 @@ spdmem_i2c_read(struct spdmem_softc *sof
reg = addr & 0xff;
- iic_acquire_bus(sc->sc_tag, 0);
+ if ((rv = iic_acquire_bus(sc->sc_tag, 0)) != 0)
+ return rv;
if (addr & 0x100) {
rv = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP, sc->sc_page1,
