diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-21 16:04:13 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-21 16:04:13 -0200 |
| commit | 6dfdfbb12b356dae762c3bce132809457ed60d97 (patch) | |
| tree | 4e87edfd6f7353e79d923ab457270e9351daec3d /sys/arm/freescale/vybrid/vf_i2c.c | |
| parent | 13010d6b0da4d97e56243edbea0a585b8285cd3e (diff) | |
| parent | d621159ed6a7d1c98cf81f17e313dffc64bf7c4f (diff) | |
| download | FreeBSD-src-6dfdfbb12b356dae762c3bce132809457ed60d97.zip FreeBSD-src-6dfdfbb12b356dae762c3bce132809457ed60d97.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'sys/arm/freescale/vybrid/vf_i2c.c')
| -rw-r--r-- | sys/arm/freescale/vybrid/vf_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c index 2eb6726..92a48d7 100644 --- a/sys/arm/freescale/vybrid/vf_i2c.c +++ b/sys/arm/freescale/vybrid/vf_i2c.c @@ -233,7 +233,7 @@ i2c_repeated_start(device_t dev, u_char slave, int timeout) if ((READ1(sc, I2C_IBSR) & IBSR_IBB) == 0) { mtx_unlock(&sc->mutex); - return (IIC_EBUSBSY); + return (IIC_EBUSERR); } /* Set repeated start condition */ @@ -276,7 +276,7 @@ i2c_start(device_t dev, u_char slave, int timeout) if (READ1(sc, I2C_IBSR) & IBSR_IBB) { mtx_unlock(&sc->mutex); vf_i2c_dbg(sc, "cant i2c start: IIC_EBUSBSY\n"); - return (IIC_EBUSBSY); + return (IIC_EBUSERR); } /* Set start condition */ |
