Sigve Sebastian Farstad / mbed-src

mbed w/ spi bug fig

Dependents:   display-puck

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 250:3424e7e3604b, committed 2014-07-17

Comitter:
sigveseb
Date:
Thu Jul 17 14:16:03 2014 +0000
Parent:
249:5706c6e2db45
Commit message:
-

Changed in this revision

targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c Show annotated file Show diff for this revision Revisions of this file 
diff -r 5706c6e2db45 -r 3424e7e3604b targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c	Thu Jul 17 14:16:03 2014 +0000
@@ -69,7 +69,7 @@
         obj->spi = (NRF_SPI_Type*)NC;
         obj->spis = (NRF_SPIS_Type*)spi;
     }
-    MBED_ASSERT((int)obj->spi != NC && (int)obj->spis != NC);
+    MBED_ASSERT((int)obj->spi != NC || (int)obj->spis != NC);
 
       // pin out the spi pins
     if (ssel != NC) {//slave