Merge pull request #3806 from 0xc0170/fix_issue#2989

0xc0170 · web-flow · commit ff41cc97ae2a · 2017-02-21T17:13:07.000Z
NXP KL43Z/KL27Z: fix spi format bits check
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/spi_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/spi_api.c
@@ -65,7 +65,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
     spi_master_config_t master_config;
     spi_slave_config_t slave_config;
 
-    if ((bits != 8) || (bits != 16)) {
+    if ((bits != 8) && (bits != 16)) {
         error("Only 8bits and 16bits SPI supported");
         return;
     }
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/spi_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/spi_api.c
@@ -65,7 +65,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
     spi_master_config_t master_config;
     spi_slave_config_t slave_config;
 
-    if ((bits != 8) || (bits != 16)) {
+    if ((bits != 8) && (bits != 16)) {
         error("Only 8bits and 16bits SPI supported");
         return;
     }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)`
`65`	`65`	`spi_master_config_t master_config;`
`66`	`66`	`spi_slave_config_t slave_config;`
`67`	`67`
`68`		`- if ((bits != 8) \|\| (bits != 16)) {`
	`68`	`+ if ((bits != 8) && (bits != 16)) {`
`69`	`69`	`error("Only 8bits and 16bits SPI supported");`
`70`	`70`	`return;`
`71`	`71`	`}`