svn commit: r360317 - in stable: 11/usr.sbin/i2c 12/usr.sbin/i2c

Dimitry Andric dim at FreeBSD.org
Sat Apr 25 15:45:43 UTC 2020


Author: dim
Date: Sat Apr 25 15:45:43 2020
New Revision: 360317
URL: https://svnweb.freebsd.org/changeset/base/360317

Log:
  MFC r354796 (by arichardson):
  
  Fix error found by new clang operator precendence warning
  
  error: operator '?:' has lower precedence than '|'; '|' will be evaluated first
  
  I discovered this in CheriBSD after updating our fork of clang to the latest
  upstream master.
  
  Reviewed By:	ian
  Differential Revision: https://reviews.freebsd.org/D22433

Modified:
  stable/12/usr.sbin/i2c/i2c.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/usr.sbin/i2c/i2c.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/usr.sbin/i2c/i2c.c
==============================================================================
--- stable/12/usr.sbin/i2c/i2c.c	Sat Apr 25 15:44:25 2020	(r360316)
+++ stable/12/usr.sbin/i2c/i2c.c	Sat Apr 25 15:45:43 2020	(r360317)
@@ -590,7 +590,7 @@ i2c_rdwr_transfer(char *dev, struct options i2c_opt, c
 	 * because of the NOSTOP flag used above.
 	 */
 	if (i2c_opt.dir == 'w')
-		msgs[i].flags = IIC_M_WR | (i > 0) ? IIC_M_NOSTART : 0;
+		msgs[i].flags = IIC_M_WR | ((i > 0) ? IIC_M_NOSTART : 0);
 	else
 		msgs[i].flags = IIC_M_RD;
 	msgs[i].slave = i2c_opt.addr;


More information about the svn-src-stable-12 mailing list