Merge branch 'photon'

This commit is contained in:
Gregory Nutt
2017-05-03 18:31:17 -06:00
9 changed files with 21 additions and 21 deletions
+1
View File
@@ -339,6 +339,7 @@ void bcmf_core_disable(FAR struct bcmf_sdio_dev_s *sbus, unsigned int core)
wlerr("Invalid core id %d\n", core); wlerr("Invalid core id %d\n", core);
return; return;
} }
uint32_t base = sbus->chip->core_base[core]; uint32_t base = sbus->chip->core_base[core];
/* Check if core is already in reset state */ /* Check if core is already in reset state */
-1
View File
@@ -912,4 +912,3 @@ int bcmf_wl_set_ssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
} }
return OK; return OK;
} }