svn commit: r251889 - stable/9/sys/dev/mpt

[Xin LI]

Author: delphij
Date: Tue Jun 18 04:03:12 2013
New Revision: 251889
URL: http://svnweb.freebsd.org/changeset/base/251889

Log:
  MFC r251187:
  
  Explicitly use a pair of parentheses to ensure correct evaluation
  ordering for bitwise operation.
  
  Submitted by:	swildner (DragonFly)

Modified:
  stable/9/sys/dev/mpt/mpt_raid.c
  stable/9/sys/dev/mpt/mpt_user.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/mpt/mpt_raid.c
==============================================================================
--- stable/9/sys/dev/mpt/mpt_raid.c	Tue Jun 18 03:34:08 2013	(r251888)
+++ stable/9/sys/dev/mpt/mpt_raid.c	Tue Jun 18 04:03:12 2013	(r251889)
@@ -605,7 +605,7 @@ mpt_issue_raid_req(struct mpt_softc *mpt
 	MPI_pSGE_SET_FLAGS(se, (MPI_SGE_FLAGS_SIMPLE_ELEMENT |
 	    MPI_SGE_FLAGS_LAST_ELEMENT | MPI_SGE_FLAGS_END_OF_BUFFER |
 	    MPI_SGE_FLAGS_END_OF_LIST |
-	    write ? MPI_SGE_FLAGS_HOST_TO_IOC : MPI_SGE_FLAGS_IOC_TO_HOST));
+	    (write ? MPI_SGE_FLAGS_HOST_TO_IOC : MPI_SGE_FLAGS_IOC_TO_HOST)));
 	se->FlagsLength = htole32(se->FlagsLength);
 	rap->MsgContext = htole32(req->index | raid_handler_id);
 

Modified: stable/9/sys/dev/mpt/mpt_user.c
==============================================================================
--- stable/9/sys/dev/mpt/mpt_user.c	Tue Jun 18 03:34:08 2013	(r251888)
+++ stable/9/sys/dev/mpt/mpt_user.c	Tue Jun 18 04:03:12 2013	(r251889)
@@ -548,8 +548,8 @@ mpt_user_raid_action(struct mpt_softc *m
 		MPI_pSGE_SET_FLAGS(se, (MPI_SGE_FLAGS_SIMPLE_ELEMENT |
 		    MPI_SGE_FLAGS_LAST_ELEMENT | MPI_SGE_FLAGS_END_OF_BUFFER |
 		    MPI_SGE_FLAGS_END_OF_LIST |
-		    raid_act->write ? MPI_SGE_FLAGS_HOST_TO_IOC :
-		    MPI_SGE_FLAGS_IOC_TO_HOST));
+		    (raid_act->write ? MPI_SGE_FLAGS_HOST_TO_IOC :
+		    MPI_SGE_FLAGS_IOC_TO_HOST)));
 	}
 	se->FlagsLength = htole32(se->FlagsLength);
 	rap->MsgContext = htole32(req->index | user_handler_id);