You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/11/03 06:13:02 UTC

[incubator-nuttx] branch master updated: bcm43xxx: corrected SDIO_CCCR_HIGHSPEED_SHS bit handling

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 02e2b33  bcm43xxx: corrected SDIO_CCCR_HIGHSPEED_SHS bit handling
02e2b33 is described below

commit 02e2b33c1c81d06827e426b0d63e22be0e878c03
Author: Alexander Lunev <al...@mail.ru>
AuthorDate: Wed Nov 3 07:46:15 2021 +0300

    bcm43xxx: corrected SDIO_CCCR_HIGHSPEED_SHS bit handling
---
 drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
index 76b3ddd..4b4a410 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
@@ -255,8 +255,12 @@ int bcmf_probe(FAR struct bcmf_sdio_dev_s *sbus)
    */
 
   ret = bcmf_read_reg(sbus, 0, SDIO_CCCR_HIGHSPEED, &value);
+  if (ret != OK)
+    {
+      goto exit_error;
+    }
 
-  if (ret & SDIO_CCCR_HIGHSPEED_SHS)
+  if (value & SDIO_CCCR_HIGHSPEED_SHS)
     {
       /* If the chip confirms its High-Speed capability,
        * enable the High-Speed mode.
@@ -264,6 +268,10 @@ int bcmf_probe(FAR struct bcmf_sdio_dev_s *sbus)
 
       ret = bcmf_write_reg(sbus, 0, SDIO_CCCR_HIGHSPEED,
                            SDIO_CCCR_HIGHSPEED_EHS);
+      if (ret != OK)
+        {
+          goto exit_error;
+        }
     }
   else
     {